diff options
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/formats.c | 2 | ||||
| -rw-r--r-- | libavfilter/vf_crop.c | 2 | ||||
| -rw-r--r-- | libavfilter/vf_fieldorder.c | 4 | ||||
| -rw-r--r-- | libavfilter/vf_pixdesctest.c | 4 | ||||
| -rw-r--r-- | libavfilter/vf_scale.c | 8 |
5 files changed, 10 insertions, 10 deletions
diff --git a/libavfilter/formats.c b/libavfilter/formats.c index ea2462793e..ebb5588866 100644 --- a/libavfilter/formats.c +++ b/libavfilter/formats.c @@ -364,7 +364,7 @@ AVFilterFormats *ff_all_formats(enum AVMediaType type) for (fmt = 0; fmt < num_formats; fmt++) { const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(fmt); if ((type != AVMEDIA_TYPE_VIDEO) || - (type == AVMEDIA_TYPE_VIDEO && !(desc->flags & PIX_FMT_HWACCEL))) + (type == AVMEDIA_TYPE_VIDEO && !(desc->flags & AV_PIX_FMT_FLAG_HWACCEL))) ff_add_format(&ret, fmt); } diff --git a/libavfilter/vf_crop.c b/libavfilter/vf_crop.c index 5d7dd2cc88..72137def19 100644 --- a/libavfilter/vf_crop.c +++ b/libavfilter/vf_crop.c @@ -285,7 +285,7 @@ static int filter_frame(AVFilterLink *link, AVFrame *frame) frame->data[0] += crop->y * frame->linesize[0]; frame->data[0] += crop->x * crop->max_step[0]; - if (!(desc->flags & PIX_FMT_PAL || desc->flags & PIX_FMT_PSEUDOPAL)) { + if (!(desc->flags & AV_PIX_FMT_FLAG_PAL || desc->flags & AV_PIX_FMT_FLAG_PSEUDOPAL)) { for (i = 1; i < 3; i ++) { if (frame->data[i]) { frame->data[i] += (crop->y >> crop->vsub) * frame->linesize[i]; diff --git a/libavfilter/vf_fieldorder.c b/libavfilter/vf_fieldorder.c index 653411d853..46964fd45d 100644 --- a/libavfilter/vf_fieldorder.c +++ b/libavfilter/vf_fieldorder.c @@ -51,8 +51,8 @@ static int query_formats(AVFilterContext *ctx) formats = NULL; for (pix_fmt = 0; pix_fmt < AV_PIX_FMT_NB; pix_fmt++) { const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt); - if (!(desc->flags & PIX_FMT_HWACCEL || - desc->flags & PIX_FMT_BITSTREAM) && + if (!(desc->flags & AV_PIX_FMT_FLAG_HWACCEL || + desc->flags & AV_PIX_FMT_FLAG_BITSTREAM) && desc->nb_components && !desc->log2_chroma_h && (ret = ff_add_format(&formats, pix_fmt)) < 0) { ff_formats_unref(&formats); diff --git a/libavfilter/vf_pixdesctest.c b/libavfilter/vf_pixdesctest.c index 42afc639c3..7fd2c78f63 100644 --- a/libavfilter/vf_pixdesctest.c +++ b/libavfilter/vf_pixdesctest.c @@ -78,8 +78,8 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) } /* copy palette */ - if (priv->pix_desc->flags & PIX_FMT_PAL || - priv->pix_desc->flags & PIX_FMT_PSEUDOPAL) + if (priv->pix_desc->flags & AV_PIX_FMT_FLAG_PAL || + priv->pix_desc->flags & AV_PIX_FMT_FLAG_PSEUDOPAL) memcpy(out->data[1], in->data[1], AVPALETTE_SIZE); for (c = 0; c < priv->pix_desc->nb_components; c++) { diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c index 4343611a5d..b1246fe343 100644 --- a/libavfilter/vf_scale.c +++ b/libavfilter/vf_scale.c @@ -252,11 +252,11 @@ static int config_props(AVFilterLink *outlink) /* TODO: make algorithm configurable */ - scale->input_is_pal = desc->flags & PIX_FMT_PAL || - desc->flags & PIX_FMT_PSEUDOPAL; + scale->input_is_pal = desc->flags & AV_PIX_FMT_FLAG_PAL || + desc->flags & AV_PIX_FMT_FLAG_PSEUDOPAL; if (outfmt == AV_PIX_FMT_PAL8) outfmt = AV_PIX_FMT_BGR8; - scale->output_is_pal = av_pix_fmt_desc_get(outfmt)->flags & PIX_FMT_PAL || - av_pix_fmt_desc_get(outfmt)->flags & PIX_FMT_PSEUDOPAL; + scale->output_is_pal = av_pix_fmt_desc_get(outfmt)->flags & AV_PIX_FMT_FLAG_PAL || + av_pix_fmt_desc_get(outfmt)->flags & AV_PIX_FMT_FLAG_PSEUDOPAL; if (scale->sws) sws_freeContext(scale->sws); |