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 /libswscale | |
| 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 'libswscale')
| -rw-r--r-- | libswscale/output.c | 2 | ||||
| -rw-r--r-- | libswscale/swscale.c | 4 | ||||
| -rw-r--r-- | libswscale/swscale_internal.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/libswscale/output.c b/libswscale/output.c index 88c445f765..9c7284befe 100644 --- a/libswscale/output.c +++ b/libswscale/output.c @@ -1717,7 +1717,7 @@ yuv2gbrp_full_X_c(SwsContext *c, const int16_t *lumFilter, { const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(c->dstFormat); int i; - int hasAlpha = (desc->flags & PIX_FMT_ALPHA) && alpSrc; + int hasAlpha = (desc->flags & AV_PIX_FMT_FLAG_ALPHA) && alpSrc; uint16_t **dest16 = (uint16_t**)dest; int SH = 22 + 7 - desc->comp[0].depth_minus1; int A = 0; // init to silence warning diff --git a/libswscale/swscale.c b/libswscale/swscale.c index 7bef0c80fb..c5bba82e88 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -804,7 +804,7 @@ static void xyz12Torgb48(struct SwsContext *c, uint16_t *dst, for (xp=0; xp+2<stride; xp+=3) { int x, y, z, r, g, b; - if (desc->flags & PIX_FMT_BE) { + if (desc->flags & AV_PIX_FMT_FLAG_BE) { x = AV_RB16(src + xp + 0); y = AV_RB16(src + xp + 1); z = AV_RB16(src + xp + 2); @@ -835,7 +835,7 @@ static void xyz12Torgb48(struct SwsContext *c, uint16_t *dst, b = av_clip_c(b,0,4095); // convert from sRGBlinear to RGB and scale from 12bit to 16bit - if (desc->flags & PIX_FMT_BE) { + if (desc->flags & AV_PIX_FMT_FLAG_BE) { AV_WB16(dst + xp + 0, c->rgbgamma[r] << 4); AV_WB16(dst + xp + 1, c->rgbgamma[g] << 4); AV_WB16(dst + xp + 2, c->rgbgamma[b] << 4); diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h index 65f9c9b934..3d5d2affd8 100644 --- a/libswscale/swscale_internal.h +++ b/libswscale/swscale_internal.h @@ -742,7 +742,7 @@ static av_always_inline int isALPHA(enum AVPixelFormat pix_fmt) { const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt); av_assert0(desc); - return desc->flags & PIX_FMT_ALPHA; + return desc->flags & AV_PIX_FMT_FLAG_ALPHA; } #if 1 |