FFmpeg/libavcodec
Michael Niedermayer af7dd79a32 Merge commit '50ba57e0ce63d9904269ea0728936a0c79f8bfb5'
* commit '50ba57e0ce63d9904269ea0728936a0c79f8bfb5':
  lavc: do not use av_pix_fmt_descriptors directly.

Conflicts:
	libavcodec/imgconvert.c
	libavcodec/libopenjpegdec.c
	libavcodec/libopenjpegenc.c
	libavcodec/mpegvideo.c
	libavcodec/rawdec.c
	libavcodec/rawenc.c
	libavcodec/tiffenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-12 16:48:26 +02:00
..
2012-10-08 02:09:28 +02:00
2012-10-09 04:00:55 +02:00
2012-10-08 09:06:25 +00:00
2012-09-21 01:03:31 +02:00
2012-10-08 09:06:25 +00:00
2012-09-30 14:05:04 +00:00
2012-10-09 16:48:43 +02:00
2012-10-12 01:44:35 +02:00
2012-10-03 16:14:59 +02:00
2012-10-11 08:06:45 +00:00
2012-09-10 21:04:01 +02:00
2012-10-01 13:42:44 -04:00
2012-09-18 17:37:41 +02:00
2012-10-08 09:06:25 +00:00
2012-10-08 09:06:25 +00:00
2012-10-08 09:06:25 +00:00
2012-10-08 22:49:23 -05:00
2012-10-09 10:13:14 +02:00
2012-10-12 02:26:50 +02:00
2012-09-30 13:39:38 +00:00
2012-10-10 16:48:13 +00:00
2012-10-08 09:06:25 +00:00
2012-09-23 15:24:08 +02:00