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)
* 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>
1  2 
libavcodec/mpeg12.c
libavcodec/mpeg12dec.c

Simple merge
Simple merge