diff options
author | Anton Khirnov <anton@khirnov.net> | 2013-05-12 15:41:49 +0200 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2013-05-15 07:46:51 +0200 |
commit | e6c4ac7b5f038be56dfbb0171f5dd0cb850d9b28 (patch) | |
tree | f9d632e93ffd3b2fb7973da19bf1af63b1e33889 /libavfilter | |
parent | 7c57a582a03fb473091a88737ab92b9f2a5bb87a (diff) | |
download | ffmpeg-e6c4ac7b5f038be56dfbb0171f5dd0cb850d9b28.tar.gz |
pixdesc: rename PIX_FMT_* flags to AV_PIX_FMT_FLAG_*
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 | 4 |
5 files changed, 8 insertions, 8 deletions
diff --git a/libavfilter/formats.c b/libavfilter/formats.c index 3b890d2bda..c7b8075139 100644 --- a/libavfilter/formats.c +++ b/libavfilter/formats.c @@ -216,7 +216,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 ec545b3d58..4dd93c8d22 100644 --- a/libavfilter/vf_crop.c +++ b/libavfilter/vf_crop.c @@ -261,7 +261,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 a7183a2091..c002b656d4 100644 --- a/libavfilter/vf_fieldorder.c +++ b/libavfilter/vf_fieldorder.c @@ -56,8 +56,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 65f7eceb72..5407ec6989 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], 256*4); for (c = 0; c < priv->pix_desc->nb_components; c++) { diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c index 53e336af0e..573e0b1d34 100644 --- a/libavfilter/vf_scale.c +++ b/libavfilter/vf_scale.c @@ -220,8 +220,8 @@ static int config_props(AVFilterLink *outlink) outlink->w, outlink->h, av_get_pix_fmt_name(outlink->format), scale->flags); - 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 (scale->sws) sws_freeContext(scale->sws); |