From c0b87359b29ae1267902c41f2576a1c0ca32849f Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Sun, 12 Feb 2012 17:07:09 -0800 Subject: swscale: handle gray16 as a "planar" YUV format (Y-only, of course). This allows removing any gray16-specific code, which is essentially identical to the per-plane code in yuv2plane*(). --- libswscale/swscale.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libswscale/swscale.c') diff --git a/libswscale/swscale.c b/libswscale/swscale.c index d05e6819a8..d8a2e31620 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -554,7 +554,7 @@ static int swScale(SwsContext *c, const uint8_t* src[], chrVSrcPtr = tmpV; } - if (isPlanarYUV(dstFormat) || dstFormat==PIX_FMT_GRAY8) { //YV12 like + if (isPlanarYUV(dstFormat) || (isGray(dstFormat) && !isALPHA(dstFormat))) { //YV12 like const int chrSkipMask= (1<chrDstVSubSample)-1; if (vLumFilterSize == 1) { -- cgit v1.2.3