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-02-06 23:35:02 +01:00
2014-08-06 19:24:57 +02:00
2014-08-06 19:25:08 +02:00
2014-05-21 03:25:08 +02:00
2014-12-03 23:03:13 +01:00
2015-02-06 23:35:02 +01:00
2014-08-06 19:24:49 +02:00
2015-03-14 11:45:11 +01:00
2015-01-25 18:20:43 -03:00
2014-12-15 02:34:05 +01:00
2014-04-19 09:56:01 +02:00