[FFmpeg-cvslog] Merge commit 'ae3822bca16f1cdb2460a35b16f8ef636a04314e'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Nov 21 18:00:56 2012 +0100| [b044e81f069cc97488868c3f2ef393c193644f0c] | committer: Michael Niedermayer

Merge commit 'ae3822bca16f1cdb2460a35b16f8ef636a04314e'

* commit 'ae3822bca16f1cdb2460a35b16f8ef636a04314e':
  imgconvert: remove PixFmtInfo

Conflicts:
	libavcodec/imgconvert.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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