Merge commit '38f64c03301ac66d7b54b3e4bd2bf6454f9fb2d3'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 16 Aug 2013 11:13:58 +0000 (13:13 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 16 Aug 2013 11:13:58 +0000 (13:13 +0200)
commitdbcee7cc5c26fd6bf5007076493f9d9c81c5bf8c
tree5a195f55fcc76c605776ff9e7a509a5f0b01c1d9
parent89f4812cda5f91b46531637f2f76e6dd0bbfba79
parent38f64c03301ac66d7b54b3e4bd2bf6454f9fb2d3
Merge commit '38f64c03301ac66d7b54b3e4bd2bf6454f9fb2d3'

* commit '38f64c03301ac66d7b54b3e4bd2bf6454f9fb2d3':
  mpeg12decdata.h: Move all tables to the only place they are used

Conflicts:
libavcodec/mpeg12decdata.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mpeg12.c
libavcodec/mpeg12dec.c