summaryrefslogtreecommitdiff
path: root/libswscale/swscale.c
diff options
context:
space:
mode:
authorRonald S. Bultje <rsbultje@gmail.com>2012-02-12 17:07:09 -0800
committerRonald S. Bultje <rsbultje@gmail.com>2012-02-13 07:14:05 -0800
commitc0b87359b29ae1267902c41f2576a1c0ca32849f (patch)
treec48aa4965c85474359652d0a6490a4047d569973 /libswscale/swscale.c
parent9d9c84649178468241a65e7e99c095ef192803c0 (diff)
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*().
Diffstat (limited to 'libswscale/swscale.c')
-rw-r--r--libswscale/swscale.c2
1 files changed, 1 insertions, 1 deletions
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<<c->chrDstVSubSample)-1;
if (vLumFilterSize == 1) {