Michael Niedermayer
ff4680922f
Merge remote-tracking branch 'qatar/master'
* qatar/master:
pixdesc: rename PIX_FMT_* flags to AV_PIX_FMT_FLAG_*
Conflicts:
doc/APIchanges
libavcodec/avpicture.c
libavcodec/ffv1dec.c
libavcodec/ffv1enc.c
libavcodec/imgconvert.c
libavcodec/tiffenc.c
libavfilter/vf_pixdesctest.c
libavfilter/vf_scale.c
libavutil/imgutils.c
libavutil/pixdesc.c
libavutil/version.h
libswscale/swscale_internal.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-15 11:10:09 +02:00
..
2012-10-08 11:22:42 +02:00
2013-04-18 17:03:01 +02:00
2013-05-15 11:10:09 +02:00
2012-12-19 09:33:43 +01:00
2013-04-14 20:30:34 +02:00
2011-05-11 13:43:30 +02:00
2013-02-18 13:04:29 +01:00
2012-02-09 12:26:45 +01:00
2013-04-05 10:11:57 +02:00
2012-12-06 10:16:10 +01:00
2012-12-22 00:38:48 +01:00
2013-04-10 12:09:20 +02:00
2013-05-05 10:47:19 +02:00
2013-04-05 10:11:57 +02:00
2012-11-02 18:28:56 +01:00
2013-03-31 22:34:13 +02:00
2013-05-13 00:12:45 +02:00
2011-12-21 19:59:45 +01:00
2013-04-11 22:13:45 +02:00
2012-09-29 19:27:01 +02:00
2013-04-03 21:07:15 +02:00
2012-12-19 09:33:44 +01:00
2013-04-05 10:11:57 +02:00
2013-04-05 10:11:57 +02:00
2012-12-19 09:33:44 +01:00
2013-04-05 10:11:57 +02:00
2012-12-19 09:33:44 +01:00
2013-04-05 10:11:57 +02:00
2013-04-05 10:11:57 +02:00
2013-04-12 18:21:57 +02:00
2013-05-08 12:07:56 +02:00
2012-01-28 11:04:19 +01:00
2013-04-25 11:19:53 +02:00
2013-04-25 11:19:53 +02:00
2013-03-17 00:27:48 +01:00
2012-11-16 13:07:10 +01:00
2013-04-25 11:19:53 +02:00
2013-03-31 18:22:08 -04:00
2013-05-15 00:54:00 +02:00
2013-04-05 10:11:57 +02:00
2013-05-10 16:53:50 -03:00
2012-11-11 20:43:28 +01:00
2011-11-23 23:03:37 +01:00
2013-03-31 18:22:08 -04:00
2011-09-02 23:08:03 +02:00
2012-12-19 09:33:44 +01:00
2012-12-19 09:33:44 +01:00
2012-12-19 09:33:44 +01:00
2012-12-19 09:33:44 +01:00
2013-04-12 18:21:57 +02:00
2012-12-19 09:33:44 +01:00
2012-12-19 09:33:44 +01:00
2013-04-05 10:11:57 +02:00
2011-03-17 17:26:45 +01:00
2013-03-23 16:19:38 +01:00
2013-03-12 03:23:28 +01:00
2013-05-03 13:16:34 +02:00
2013-01-06 16:30:02 +01:00
2013-01-23 17:44:56 +01:00
2013-05-14 18:46:14 +02:00
2013-03-31 11:31:19 +02:00
2013-03-18 17:43:43 +01:00
2013-05-03 18:26:12 +02:00
2012-12-21 00:18:34 +01:00
2013-03-19 16:21:26 +01:00
2013-04-05 10:11:57 +02:00
2013-04-05 10:11:57 +02:00
2013-01-06 16:30:02 +01:00
2011-12-12 01:25:37 +01:00
2013-02-14 23:45:48 +01:00
2012-10-31 00:37:42 +01:00
2013-01-27 13:32:56 +01:00
2010-06-27 14:31:50 +00:00
2013-03-30 16:58:45 +01:00
2013-04-12 23:10:59 +02:00
2012-12-21 00:18:34 +01:00