[FFmpeg-cvslog] Merge commit '6d2b6f21eb45ffbda1103c772060303648714832'
Michael Niedermayer
git at videolan.org
Thu Mar 21 13:02:56 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Mar 21 12:58:00 2013 +0100| [92656787cfeaf28af368bd4c20ffbaedc8ad3ca9] | committer: Michael Niedermayer
Merge commit '6d2b6f21eb45ffbda1103c772060303648714832'
* commit '6d2b6f21eb45ffbda1103c772060303648714832':
h264: add a parameter to the CABAC macro.
h264: add a parameter to the FIELD_OR_MBAFF_PICTURE macro.
Conflicts:
libavcodec/h264.c
libavcodec/h264_cabac.c
libavcodec/h264_cavlc.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=92656787cfeaf28af368bd4c20ffbaedc8ad3ca9
---
More information about the ffmpeg-cvslog
mailing list