]> git.sesse.net Git - ffmpeg/commit
Merge commit '48d0fd2d62a476e1db9298163f1fc0abae26cc67'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 21 Mar 2013 11:34:59 +0000 (12:34 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 21 Mar 2013 11:34:59 +0000 (12:34 +0100)
commit137df692fc28710aa1a21856b1f5b9e157896fef
tree89d3f10251855bf0b7ec9519844422a420609bb5
parentbbc0f6f9789361f9ddd462bc458410e6f0081d57
parent48d0fd2d62a476e1db9298163f1fc0abae26cc67
Merge commit '48d0fd2d62a476e1db9298163f1fc0abae26cc67'

* commit '48d0fd2d62a476e1db9298163f1fc0abae26cc67':
  h264: merge common_init() into ff_h264_decode_init.

Conflicts:
libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h264.c