[FFmpeg-cvslog] Merge commit '7fa00653a550c0d24b3951c0f9fed6350ecf5ce4'
Michael Niedermayer
git at videolan.org
Thu Mar 21 12:56:58 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Mar 21 12:50:18 2013 +0100| [bf4d0f8328c8f64611ca44a6ffdc30ca4f028249] | committer: Michael Niedermayer
Merge commit '7fa00653a550c0d24b3951c0f9fed6350ecf5ce4'
* commit '7fa00653a550c0d24b3951c0f9fed6350ecf5ce4':
h264: add a parameter to the FIELD_PICTURE macro.
h264: add a parameter to the FRAME_MBAFF macro.
Conflicts:
libavcodec/h264.c
libavcodec/h264_loopfilter.c
libavcodec/h264_refs.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bf4d0f8328c8f64611ca44a6ffdc30ca4f028249
---
More information about the ffmpeg-cvslog
mailing list