diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-15 13:23:14 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-15 13:23:14 +0400 |
| commit | c7c71f95f8d3e98babf8b6b7f1edc49f14e2c4c4 (patch) | |
| tree | b734a52c2c51db2b0ccf4b4159abe9865746ceb2 /libavutil/imgutils.c | |
| parent | ff4680922fc4f1295081da45173e9a71d141a045 (diff) | |
replace remaining PIX_FMT_* flags with AV_PIX_FMT_FLAG_*
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/imgutils.c')
| -rw-r--r-- | libavutil/imgutils.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavutil/imgutils.c b/libavutil/imgutils.c index d370a60416..d8a579fc62 100644 --- a/libavutil/imgutils.c +++ b/libavutil/imgutils.c @@ -76,7 +76,7 @@ int av_image_get_linesize(enum AVPixelFormat pix_fmt, int width, int plane) int max_step [4]; /* max pixel step for each plane */ int max_step_comp[4]; /* the component for each plane which has the max pixel step */ - if ((unsigned)pix_fmt >= AV_PIX_FMT_NB || desc->flags & PIX_FMT_HWACCEL) + if ((unsigned)pix_fmt >= AV_PIX_FMT_NB || desc->flags & AV_PIX_FMT_FLAG_HWACCEL) return AVERROR(EINVAL); av_image_fill_max_pixsteps(max_step, max_step_comp, desc); @@ -324,7 +324,7 @@ int av_image_get_buffer_size(enum AVPixelFormat pix_fmt, int width, int height, return AVERROR(EINVAL); if (av_image_check_size(width, height, 0, NULL) < 0) return AVERROR(EINVAL); - 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 av_image_fill_arrays(data, linesize, NULL, pix_fmt, width, height, align); @@ -358,7 +358,7 @@ int av_image_copy_to_buffer(uint8_t *dst, int dst_size, } } - if (desc->flags & PIX_FMT_PAL) { + if (desc->flags & AV_PIX_FMT_FLAG_PAL) { uint32_t *d32 = (uint32_t *)(((size_t)dst + 3) & ~3); for (i = 0; i<256; i++) AV_WL32(d32 + i, AV_RN32(src_data[1] + 4*i)); |