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 /libavcodec | |
| parent | ff4680922fc4f1295081da45173e9a71d141a045 (diff) | |
| download | ffmpeg-c7c71f95f8d3e98babf8b6b7f1edc49f14e2c4c4.tar.gz | |
replace remaining PIX_FMT_* flags with AV_PIX_FMT_FLAG_*
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/dpxenc.c | 6 | ||||
| -rw-r--r-- | libavcodec/imgconvert.c | 4 | ||||
| -rw-r--r-- | libavcodec/utils.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/dpxenc.c b/libavcodec/dpxenc.c index 305393f66f..aaaa15babf 100644 --- a/libavcodec/dpxenc.c +++ b/libavcodec/dpxenc.c @@ -37,10 +37,10 @@ static av_cold int encode_init(AVCodecContext *avctx) DPXContext *s = avctx->priv_data; const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(avctx->pix_fmt); - s->big_endian = !!(desc->flags & PIX_FMT_BE); + s->big_endian = !!(desc->flags & AV_PIX_FMT_FLAG_BE); s->bits_per_component = desc->comp[0].depth_minus1 + 1; - s->descriptor = (desc->flags & PIX_FMT_ALPHA) ? 51 : 50; - s->planar = !!(desc->flags & PIX_FMT_PLANAR); + s->descriptor = (desc->flags & AV_PIX_FMT_FLAG_ALPHA) ? 51 : 50; + s->planar = !!(desc->flags & AV_PIX_FMT_FLAG_PLANAR); switch (avctx->pix_fmt) { case AV_PIX_FMT_GBRP10BE: diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c index 6312ec93e8..e872035e39 100644 --- a/libavcodec/imgconvert.c +++ b/libavcodec/imgconvert.c @@ -59,7 +59,7 @@ #endif #define pixdesc_has_alpha(pixdesc) \ - ((pixdesc)->nb_components == 2 || (pixdesc)->nb_components == 4 || (pixdesc)->flags & PIX_FMT_PAL) + ((pixdesc)->nb_components == 2 || (pixdesc)->nb_components == 4 || (pixdesc)->flags & AV_PIX_FMT_FLAG_PAL) void avcodec_get_chroma_sub_sample(enum AVPixelFormat pix_fmt, int *h_shift, int *v_shift) @@ -654,7 +654,7 @@ int main(void){ skip = 0; } av_log(NULL, AV_LOG_INFO, "pix fmt %s yuv_plan:%d avg_bpp:%d colortype:%d\n", desc->name, is_yuv_planar(desc), av_get_padded_bits_per_pixel(desc), get_color_type(desc)); - if ((!(desc->flags & PIX_FMT_ALPHA)) != (desc->nb_components != 2 && desc->nb_components != 4)) { + if ((!(desc->flags & AV_PIX_FMT_FLAG_ALPHA)) != (desc->nb_components != 2 && desc->nb_components != 4)) { av_log(NULL, AV_LOG_ERROR, "Alpha flag mismatch\n"); err = 1; } diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 0f6496d208..573bba6342 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -568,7 +568,7 @@ void avpriv_color_frame(AVFrame *frame, const int c[4]) const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(frame->format); int p, y, x; - av_assert0(desc->flags & PIX_FMT_PLANAR); + av_assert0(desc->flags & AV_PIX_FMT_FLAG_PLANAR); for (p = 0; p<desc->nb_components; p++) { uint8_t *dst = frame->data[p]; |