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 /libavutil/pixdesc.h | |
| parent | 4bf3bc6f96cfbf68191625ade624ac97595de781 (diff) | |
| parent | d1d9efaae6c7e8466b06c30ca21c6b569dd2e480 (diff) | |
| download | ffmpeg-494945cb66fae7678efbde0be14b4d5e6fa5824d.tar.gz | |
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 'libavutil/pixdesc.h')
| -rw-r--r-- | libavutil/pixdesc.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavutil/pixdesc.h b/libavutil/pixdesc.h index dca56a71aa..59fd1fff25 100644 --- a/libavutil/pixdesc.h +++ b/libavutil/pixdesc.h @@ -99,6 +99,9 @@ typedef struct AVPixFmtDescriptor{ */ #define PIX_FMT_PSEUDOPAL 64 +#define PIX_FMT_ALPHA 128 ///< The pixel format has an alpha channel + + #if FF_API_PIX_FMT_DESC /** * The array of all the pixel format descriptors. |