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 /libavcodec/avpicture.c | |
| parent | 7c57a582a03fb473091a88737ab92b9f2a5bb87a (diff) | |
| download | ffmpeg-e6c4ac7b5f038be56dfbb0171f5dd0cb850d9b28.tar.gz | |
pixdesc: rename PIX_FMT_* flags to AV_PIX_FMT_FLAG_*
Diffstat (limited to 'libavcodec/avpicture.c')
| -rw-r--r-- | libavcodec/avpicture.c | 4 |
1 files changed, 2 insertions, 2 deletions
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); |