[FFmpeg-cvslog] Merge commit '50ba57e0ce63d9904269ea0728936a0c79f8bfb5'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Oct 12 16:48:26 2012 +0200| [af7dd79a323090b14a7fb9ef24a3f6a24dc6d2db] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=af7dd79a323090b14a7fb9ef24a3f6a24dc6d2db
---