Files
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-03-10 23:33:57 +01:00
2015-04-18 14:13:59 -03:00
2015-05-13 01:59:51 +02:00
2015-04-20 04:11:23 +02:00
2015-02-21 20:38:13 +01:00
2015-04-22 17:45:51 +02:00
2015-04-29 20:13:59 +02:00
2015-04-18 14:14:24 -03:00
2015-05-15 18:29:40 +02:00
2015-04-18 14:14:11 -03:00
2015-05-06 17:50:09 +02:00
2015-02-14 19:45:23 +00:00
2015-03-14 14:05:25 +01:00
2015-02-10 14:20:32 +00:00
2015-03-02 19:32:23 +01: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-03-16 13:04:47 +01:00
2015-02-14 12:48:41 +00:00
2015-05-13 00:41:38 +02:00
2015-04-18 18:07:54 -03:00