Michael Niedermayer 567616c1b3 Merge commit '8a776ad90e00ab2b98e8683ac6182d641a383c3a' ...

* commit '8a776ad90e00ab2b98e8683ac6182d641a383c3a':
  h261: Move shared data tables from a header to a proper C file

Conflicts:
	libavcodec/Makefile
	libavcodec/h261data.c
	libavcodec/h261dec.c
	libavcodec/h261enc.c

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

2013-04-11 14:25:38 +02:00

5.0 KiB

Raw Blame History

View Raw