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)
commit16466d92b9f795579d4020b1c7cb3ad7750cc182
treef5e6a2057512a9c14d81e5730ed72c7fda27bb7d
parente9cb43c6f67c8882dc3f303082e9398a0cff06e1
parentc4e43560fe6677e9d60bfb3cffc41c7324e92a0b
Merge commit 'c4e43560fe6677e9d60bfb3cffc41c7324e92a0b'

* commit 'c4e43560fe6677e9d60bfb3cffc41c7324e92a0b':
  h264data: Move some tables to the only place they are used

Conflicts:
libavcodec/h264data.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h264.c
libavcodec/h264data.h
libavcodec/svq3.c