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 /libavfilter/drawutils.c | |
| 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 'libavfilter/drawutils.c')
| -rw-r--r-- | libavfilter/drawutils.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavfilter/drawutils.c b/libavfilter/drawutils.c index 69946f9301..272d9df6bb 100644 --- a/libavfilter/drawutils.c +++ b/libavfilter/drawutils.c @@ -151,7 +151,7 @@ int ff_draw_init(FFDrawContext *draw, enum AVPixelFormat format, unsigned flags) if (!desc->name) return AVERROR(EINVAL); - if (desc->flags & ~(PIX_FMT_PLANAR | PIX_FMT_RGB | PIX_FMT_PSEUDOPAL | PIX_FMT_ALPHA)) + if (desc->flags & ~(AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_PSEUDOPAL | AV_PIX_FMT_FLAG_ALPHA)) return AVERROR(ENOSYS); for (i = 0; i < desc->nb_components; i++) { c = &desc->comp[i]; @@ -176,7 +176,7 @@ int ff_draw_init(FFDrawContext *draw, enum AVPixelFormat format, unsigned flags) draw->format = format; draw->nb_planes = nb_planes; memcpy(draw->pixelstep, pixelstep, sizeof(draw->pixelstep)); - if (nb_planes >= 3 && !(desc->flags & PIX_FMT_RGB)) { + if (nb_planes >= 3 && !(desc->flags & AV_PIX_FMT_FLAG_RGB)) { draw->hsub[1] = draw->hsub[2] = draw->hsub_max = desc->log2_chroma_w; draw->vsub[1] = draw->vsub[2] = draw->vsub_max = desc->log2_chroma_h; } @@ -193,7 +193,7 @@ void ff_draw_color(FFDrawContext *draw, FFDrawColor *color, const uint8_t rgba[4 if (rgba != color->rgba) memcpy(color->rgba, rgba, sizeof(color->rgba)); - if ((draw->desc->flags & PIX_FMT_RGB) && draw->nb_planes == 1 && + if ((draw->desc->flags & AV_PIX_FMT_FLAG_RGB) && draw->nb_planes == 1 && ff_fill_rgba_map(rgba_map, draw->format) >= 0) { for (i = 0; i < 4; i++) color->comp[0].u8[rgba_map[i]] = rgba[i]; |