diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-15 11:23:14 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-15 11:23:14 +0200 |
commit | c7c71f95f8d3e98babf8b6b7f1edc49f14e2c4c4 (patch) | |
tree | b734a52c2c51db2b0ccf4b4159abe9865746ceb2 /libavfilter/formats.c | |
parent | ff4680922fc4f1295081da45173e9a71d141a045 (diff) | |
download | ffmpeg-streaming-c7c71f95f8d3e98babf8b6b7f1edc49f14e2c4c4.zip ffmpeg-streaming-c7c71f95f8d3e98babf8b6b7f1edc49f14e2c4c4.tar.gz |
replace remaining PIX_FMT_* flags with AV_PIX_FMT_FLAG_*
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/formats.c')
-rw-r--r-- | libavfilter/formats.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavfilter/formats.c b/libavfilter/formats.c index ebb5588..016aecd 100644 --- a/libavfilter/formats.c +++ b/libavfilter/formats.c @@ -112,10 +112,10 @@ AVFilterFormats *ff_merge_formats(AVFilterFormats *a, AVFilterFormats *b, for (j = 0; j < b->format_count; j++) { const AVPixFmtDescriptor *adesc = av_pix_fmt_desc_get(a->formats[i]); const AVPixFmtDescriptor *bdesc = av_pix_fmt_desc_get(b->formats[j]); - alpha2 |= adesc->flags & bdesc->flags & PIX_FMT_ALPHA; + alpha2 |= adesc->flags & bdesc->flags & AV_PIX_FMT_FLAG_ALPHA; chroma2|= adesc->nb_components > 1 && bdesc->nb_components > 1; if (a->formats[i] == b->formats[j]) { - alpha1 |= adesc->flags & PIX_FMT_ALPHA; + alpha1 |= adesc->flags & AV_PIX_FMT_FLAG_ALPHA; chroma1|= adesc->nb_components > 1; } } |