From e96c3b81cadd0ba84d43b1f3a54980df3785d9a5 Mon Sep 17 00:00:00 2001 From: Vittorio Giovara Date: Tue, 29 Jul 2014 14:02:09 +0100 Subject: avutil: rename AV_PIX_FMT_Y400A to AV_PIX_FMT_YA8 The rationale is that you have a packed format in form and shortening greyscale to 'G' might make one thing about Greenscale instead. An alias pixel format and color space name are provided for compatibility. --- libswscale/swscale_unscaled.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libswscale/swscale_unscaled.c') diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c index a1ccc5ab76..21762a72ae 100644 --- a/libswscale/swscale_unscaled.c +++ b/libswscale/swscale_unscaled.c @@ -351,7 +351,7 @@ static int palToRgbWrapper(SwsContext *c, const uint8_t *src[], int srcStride[], uint8_t *dstPtr = dst[0] + dstStride[0] * srcSliceY; const uint8_t *srcPtr = src[0]; - if (srcFormat == AV_PIX_FMT_Y400A) { + if (srcFormat == AV_PIX_FMT_YA8) { switch (dstFormat) { case AV_PIX_FMT_RGB32 : conv = gray8aToPacked32; break; case AV_PIX_FMT_BGR32 : conv = gray8aToPacked32; break; @@ -1204,7 +1204,7 @@ int attribute_align_arg sws_scale(struct SwsContext *c, g = ((i >> 1) & 3) * 85; b = ( i & 1) * 255; } else if (c->srcFormat == AV_PIX_FMT_GRAY8 || - c->srcFormat == AV_PIX_FMT_Y400A) { + c->srcFormat == AV_PIX_FMT_YA8) { r = g = b = i; } else { assert(c->srcFormat == AV_PIX_FMT_BGR4_BYTE); -- cgit v1.2.3