diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-21 15:14:32 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-21 15:37:01 +0100 |
| commit | 494945cb66fae7678efbde0be14b4d5e6fa5824d (patch) | |
| tree | 3686bdf1b506f86909d609e4ecb3bbdc8476e3fd /libavformat/rawenc.c | |
| parent | 4bf3bc6f96cfbf68191625ade624ac97595de781 (diff) | |
| parent | d1d9efaae6c7e8466b06c30ca21c6b569dd2e480 (diff) | |
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>
Diffstat (limited to 'libavformat/rawenc.c')
0 files changed, 0 insertions, 0 deletions