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

14 KiB

Raw Blame History

View Raw