From e6c4ac7b5f038be56dfbb0171f5dd0cb850d9b28 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sun, 12 May 2013 15:41:49 +0200 Subject: pixdesc: rename PIX_FMT_* flags to AV_PIX_FMT_FLAG_* --- libavcodec/avpicture.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libavcodec/avpicture.c') diff --git a/libavcodec/avpicture.c b/libavcodec/avpicture.c index 259fd8e690..a50bbc497f 100644 --- a/libavcodec/avpicture.c +++ b/libavcodec/avpicture.c @@ -75,7 +75,7 @@ int avpicture_layout(const AVPicture* src, enum AVPixelFormat pix_fmt, } } - if (desc->flags & PIX_FMT_PAL) + if (desc->flags & AV_PIX_FMT_FLAG_PAL) memcpy((unsigned char *)(((size_t)dest + 3) & ~3), src->data[1], 256 * 4); @@ -92,7 +92,7 @@ int avpicture_get_size(enum AVPixelFormat pix_fmt, int width, int height) return AVERROR(EINVAL); if ((ret = av_image_check_size(width, height, 0, NULL)) < 0) return ret; - if (desc->flags & PIX_FMT_PSEUDOPAL) + if (desc->flags & AV_PIX_FMT_FLAG_PSEUDOPAL) // do not include palette for these pseudo-paletted formats return width * height; return avpicture_fill(&dummy_pict, NULL, pix_fmt, width, height); -- cgit v1.2.3