[FFmpeg-cvslog] Merge commit '48d0fd2d62a476e1db9298163f1fc0abae26cc67'
Michael Niedermayer
git at videolan.org
Thu Mar 21 12:40:43 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Mar 21 12:34:59 2013 +0100| [137df692fc28710aa1a21856b1f5b9e157896fef] | committer: Michael Niedermayer
Merge commit '48d0fd2d62a476e1db9298163f1fc0abae26cc67'
* commit '48d0fd2d62a476e1db9298163f1fc0abae26cc67':
h264: merge common_init() into ff_h264_decode_init.
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=137df692fc28710aa1a21856b1f5b9e157896fef
---
More information about the ffmpeg-cvslog
mailing list