Merge commit 'd1d9efaae6c7e8466b06c30ca21c6b569dd2e480'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 21 Nov 2012 14:14:32 +0000 (15:14 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 21 Nov 2012 14:37:01 +0000 (15:37 +0100)
commit494945cb66fae7678efbde0be14b4d5e6fa5824d
tree3686bdf1b506f86909d609e4ecb3bbdc8476e3fd
parent4bf3bc6f96cfbf68191625ade624ac97595de781
parentd1d9efaae6c7e8466b06c30ca21c6b569dd2e480
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@gmx.at>
libavcodec/Makefile
libavcodec/avpicture.c
libavcodec/imgconvert.c
libavfilter/drawutils.c
libavutil/pixdesc.c
libavutil/pixdesc.h