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-10 12:09:20 +02:00
2013-03-31 22:34:13 +02:00
2013-05-13 00:12:45 +02:00
2013-04-11 22:13:45 +02:00
2013-04-03 21:07:15 +02:00
2012-01-28 11:04:19 +01:00
2013-05-15 00:54:00 +02:00
2013-05-10 16:53:50 -03:00
2013-01-06 16:30:02 +01:00
2013-05-03 18:26:12 +02:00
2012-12-21 00:18:34 +01:00
2013-01-06 16:30:02 +01:00
2013-02-14 23:45:48 +01:00
2012-12-21 00:18:34 +01:00