FFmpeg/libavcodec
Michael Niedermayer bf4d0f8328 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@gmx.at>
2013-03-21 12:50:18 +01:00
..
2013-03-18 02:10:10 +01:00
2013-03-19 13:28:29 +01:00
2013-03-15 21:09:36 +01:00
2013-03-15 04:39:41 +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-19 15:26:23 +01:00