[FFmpeg-cvslog] Merge commit '8a776ad90e00ab2b98e8683ac6182d641a383c3a'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Apr 11 14:25:38 2013 +0200| [567616c1b34a5fca1ecba82a6ff85939b6a1371e] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=567616c1b34a5fca1ecba82a6ff85939b6a1371e
---