[FFmpeg-cvslog] Merge commit 'da6be8fcec16a94d8084bda8bb8a0a411a96bcf7'
Michael Niedermayer
git at videolan.org
Thu Mar 21 12:48:09 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Mar 21 12:43:32 2013 +0100| [e168b508163d7dc05176d81e6b5ea73ac23eb38b] | committer: Michael Niedermayer
Merge commit 'da6be8fcec16a94d8084bda8bb8a0a411a96bcf7'
* commit 'da6be8fcec16a94d8084bda8bb8a0a411a96bcf7':
h264: add a parameter to the MB_FIELD macro.
h264: add a parameter to the MB_MBAFF 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=e168b508163d7dc05176d81e6b5ea73ac23eb38b
---
More information about the ffmpeg-cvslog
mailing list