Michael Niedermayer 16466d92b9 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>

2013-08-21 12:21:48 +02:00

7.4 KiB

Raw Blame History

View Raw