[FFmpeg-cvslog] Merge commit 'd1d9efaae6c7e8466b06c30ca21c6b569dd2e480'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Nov 21 15:14:32 2012 +0100| [494945cb66fae7678efbde0be14b4d5e6fa5824d] | committer: Michael Niedermayer

Merge commit 'd1d9efaae6c7e8466b06c30ca21c6b569dd2e480'

* commit 'd1d9efaae6c7e8466b06c30ca21c6b569dd2e480':
  avcodec: split avpicture from imgconvert
  pixdesc: add PIX_FMT_ALPHA flag

Conflicts:
	libavcodec/imgconvert.c

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

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