Merge commit '8a776ad90e00ab2b98e8683ac6182d641a383c3a'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 11 Apr 2013 12:25:38 +0000 (14:25 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 11 Apr 2013 12:25:38 +0000 (14:25 +0200)
commit567616c1b34a5fca1ecba82a6ff85939b6a1371e
treee973b46942bd0a8d91992b144c4133e3332a6b16
parent38d1a5a27024b90523f9c688677f423ed67e4649
parent8a776ad90e00ab2b98e8683ac6182d641a383c3a
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>
libavcodec/Makefile
libavcodec/h261.h
libavcodec/h261data.c
libavcodec/h261dec.c
libavcodec/h261enc.c