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-14 20:06:47 +01:00
2015-02-06 23:35:02 +01:00
2015-03-16 14:51:51 +01:00
2015-02-07 17:48:14 +01:00
2015-02-07 17:48:14 +01:00
2015-05-02 13:43:15 +02:00
2015-05-05 02:41:15 +02:00
2015-05-17 02:08:58 +02:00
2015-01-05 16:29:28 -03:00
2015-02-28 23:58:29 +01:00
2015-02-28 23:58:29 +01:00
2015-02-16 00:41:21 -03:00
2015-02-16 00:41:21 -03:00
2015-02-07 17:48:14 +01:00
2015-02-07 17:48:14 +01:00
2015-02-07 17:48:14 +01:00
2015-02-07 17:48:14 +01:00
2015-03-14 20:06:47 +01:00
2015-02-07 17:48:14 +01:00
2015-02-22 22:34:20 +00:00
2015-02-17 15:19:19 +01:00
2015-02-07 17:48:14 +01:00
2015-03-01 20:02:43 -03:00
2015-02-14 17:22:50 +01:00
2015-02-14 17:22:50 +01:00
2015-03-26 15:41:27 +01:00
2015-02-06 23:35:02 +01:00
2015-02-07 15:15:19 +01:00
2015-02-06 02:31:45 +01:00
2015-03-14 11:45:11 +01:00
2015-03-17 20:25:47 +01:00
2015-02-21 16:05:41 +01:00
2015-05-22 20:24:41 +02:00
2015-03-16 01:52:44 -03:00
2015-03-16 01:52:44 -03:00
2015-03-14 20:06:47 +01:00
2015-01-25 18:20:39 -03:00
2015-01-25 18:20:43 -03:00
2015-02-27 16:53:37 +01:00
2015-02-27 19:08:09 +01:00
2015-02-07 17:48:14 +01:00
2015-03-14 20:06:47 +01:00
2014-12-20 13:25:43 +01:00
2015-02-07 17:48:14 +01:00
2015-03-14 20:06:47 +01:00
2015-05-07 14:33:10 +02:00
2015-02-06 23:35:02 +01:00
2015-05-14 14:15:27 -04:00
2014-12-27 16:55:16 -05:00
2015-03-20 02:38:20 -03:00
2015-03-14 13:36:47 +01:00
2015-03-20 02:38:14 -03:00