diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-15 13:23:14 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-15 13:23:14 +0400 |
commit | c7c71f95f8d3e98babf8b6b7f1edc49f14e2c4c4 (patch) | |
tree | b734a52c2c51db2b0ccf4b4159abe9865746ceb2 /libavfilter/vf_extractplanes.c | |
parent | ff4680922fc4f1295081da45173e9a71d141a045 (diff) |
replace remaining PIX_FMT_* flags with AV_PIX_FMT_FLAG_*
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_extractplanes.c')
-rw-r--r-- | libavfilter/vf_extractplanes.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavfilter/vf_extractplanes.c b/libavfilter/vf_extractplanes.c index 9844ed578c..3c629d7a83 100644 --- a/libavfilter/vf_extractplanes.c +++ b/libavfilter/vf_extractplanes.c @@ -110,11 +110,11 @@ static int query_formats(AVFilterContext *ctx) avff = ctx->inputs[0]->in_formats; desc = av_pix_fmt_desc_get(avff->formats[0]); depth = desc->comp[0].depth_minus1; - be = desc->flags & PIX_FMT_BE; + be = desc->flags & AV_PIX_FMT_FLAG_BE; for (i = 1; i < avff->format_count; i++) { desc = av_pix_fmt_desc_get(avff->formats[i]); if (depth != desc->comp[0].depth_minus1 || - be != (desc->flags & PIX_FMT_BE)) { + be != (desc->flags & AV_PIX_FMT_FLAG_BE)) { return AVERROR(EAGAIN); } } @@ -139,10 +139,10 @@ static int config_input(AVFilterLink *inlink) int plane_avail, ret, i; uint8_t rgba_map[4]; - plane_avail = ((desc->flags & PIX_FMT_RGB) ? PLANE_R|PLANE_G|PLANE_B : + plane_avail = ((desc->flags & AV_PIX_FMT_FLAG_RGB) ? PLANE_R|PLANE_G|PLANE_B : PLANE_Y | ((desc->nb_components > 2) ? PLANE_U|PLANE_V : 0)) | - ((desc->flags & PIX_FMT_ALPHA) ? PLANE_A : 0); + ((desc->flags & AV_PIX_FMT_FLAG_ALPHA) ? PLANE_A : 0); if (e->requested_planes & ~plane_avail) { av_log(ctx, AV_LOG_ERROR, "Requested planes not available.\n"); return AVERROR(EINVAL); @@ -152,8 +152,8 @@ static int config_input(AVFilterLink *inlink) e->depth = (desc->comp[0].depth_minus1 + 1) >> 3; e->step = av_get_padded_bits_per_pixel(desc) >> 3; - e->is_packed_rgb = !(desc->flags & PIX_FMT_PLANAR); - if (desc->flags & PIX_FMT_RGB) { + e->is_packed_rgb = !(desc->flags & AV_PIX_FMT_FLAG_PLANAR); + if (desc->flags & AV_PIX_FMT_FLAG_RGB) { ff_fill_rgba_map(rgba_map, inlink->format); for (i = 0; i < 4; i++) e->map[i] = rgba_map[e->map[i]]; |