1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-04 06:08:26 +02:00
FFmpeg/libavcodec
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
..
2013-03-18 02:10:10 +01:00
2013-03-19 13:28:29 +01:00
2013-03-06 22:11:46 +01:00
2013-03-06 22:11:46 +01:00
2013-03-15 21:09:36 +01:00
2013-03-15 04:39:41 +01:00
2013-03-06 10:31:56 +00:00
2013-03-02 20:39:38 +01:00
2013-03-05 03:29:04 +01:00
2013-03-13 09:13:54 +01:00
2013-03-15 14:38:09 +01:00
2013-03-15 14:38:09 +01:00
2013-03-20 03:37:48 +01:00
2013-03-13 14:35:48 +01:00
2013-03-13 14:35:48 +01:00
2013-03-19 15:26:23 +01:00