FFmpeg/libavcodec
Michael Niedermayer d9b264bc73 Merge commit '848e86f74d3e6e87fa592ee8ba8c184cc5fd9a42'
* commit '848e86f74d3e6e87fa592ee8ba8c184cc5fd9a42':
  mpegvideo: Drop flags and flags2

Conflicts:
	libavcodec/mpeg12dec.c
	libavcodec/mpeg12enc.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo_enc.c
	libavcodec/mpegvideo_motion.c
	libavcodec/ratecontrol.c
	libavcodec/vc1_block.c
	libavcodec/vc1_loopfilter.c
	libavcodec/vc1_mc.c
	libavcodec/vc1dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-22 20:24:41 +02:00
..
2015-05-13 01:59:51 +02:00
2015-04-22 17:45:51 +02:00
2015-04-29 20:13:59 +02:00
2015-05-15 18:29:40 +02:00
2015-05-06 17:50:09 +02:00
2015-04-28 00:04:58 +02:00
2015-05-20 18:15:22 +02:00
2015-04-28 00:04:58 +02:00
2015-05-07 07:19:52 -04:00
2015-05-20 15:50:58 +02:00
2015-05-13 00:41:38 +02:00