Merge commit '20429ba96e55db17ac57f6c0e330914287f1f614'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 11 Apr 2013 12:48:21 +0000 (14:48 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 11 Apr 2013 12:48:27 +0000 (14:48 +0200)
* commit '20429ba96e55db17ac57f6c0e330914287f1f614':
  h261: Move encoder/decoder shared table init to common code

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/h261.c
libavcodec/h261.h
libavcodec/h261dec.c
libavcodec/h261enc.c

Simple merge
Simple merge
Simple merge
Simple merge