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 /libavfilter/drawutils.c | |
| 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 'libavfilter/drawutils.c')
| -rw-r--r-- | libavfilter/drawutils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavfilter/drawutils.c b/libavfilter/drawutils.c index 23ab17aa28..aefd09d1ea 100644 --- a/libavfilter/drawutils.c +++ b/libavfilter/drawutils.c @@ -141,7 +141,7 @@ int ff_draw_init(FFDrawContext *draw, enum AVPixelFormat format, unsigned flags) if (!desc->name) return AVERROR(EINVAL); - if (desc->flags & ~(PIX_FMT_PLANAR | PIX_FMT_RGB | PIX_FMT_PSEUDOPAL)) + if (desc->flags & ~(PIX_FMT_PLANAR | PIX_FMT_RGB | PIX_FMT_PSEUDOPAL | PIX_FMT_ALPHA)) return AVERROR(ENOSYS); for (i = 0; i < desc->nb_components; i++) { c = &desc->comp[i]; |