Michael Niedermayer 92656787cf 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@gmx.at>

2013-03-21 12:58:00 +01:00

19 KiB

Raw Blame History

View Raw