Merge commit 'c4e43560fe6677e9d60bfb3cffc41c7324e92a0b'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 21 Aug 2013 10:21:01 +0000 (12:21 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 21 Aug 2013 10:21:48 +0000 (12:21 +0200)
* commit 'c4e43560fe6677e9d60bfb3cffc41c7324e92a0b':
  h264data: Move some tables to the only place they are used

Conflicts:
libavcodec/h264data.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>

No differences found