]> git.sesse.net Git - ffmpeg/commitdiff
yuv2rgb: better check if source format have alpha
authorPaul B Mahol <onemda@gmail.com>
Sat, 28 Jan 2012 03:02:32 +0000 (03:02 +0000)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 28 Jan 2012 16:37:08 +0000 (17:37 +0100)
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libswscale/yuv2rgb.c

index 6100fbc692ebf5fc3266f0d9c4edc215e13b0f39..c553bc6011806e55b766483e2c87a8f4984e392c 100644 (file)
@@ -531,9 +531,9 @@ SwsFunc ff_yuv2rgb_get_func_ptr(SwsContext *c)
     case PIX_FMT_RGB48BE:
     case PIX_FMT_RGB48LE:    return yuv2rgb_c_48;
     case PIX_FMT_ARGB:
-    case PIX_FMT_ABGR:       if (CONFIG_SWSCALE_ALPHA && c->srcFormat == PIX_FMT_YUVA420P) return yuva2argb_c;
+    case PIX_FMT_ABGR:       if (CONFIG_SWSCALE_ALPHA && isALPHA(c->srcFormat)) return yuva2argb_c;
     case PIX_FMT_RGBA:
-    case PIX_FMT_BGRA:       return (CONFIG_SWSCALE_ALPHA && c->srcFormat == PIX_FMT_YUVA420P) ? yuva2rgba_c : yuv2rgb_c_32;
+    case PIX_FMT_BGRA:       return (CONFIG_SWSCALE_ALPHA && isALPHA(c->srcFormat)) ? yuva2rgba_c : yuv2rgb_c_32;
     case PIX_FMT_RGB24:      return yuv2rgb_c_24_rgb;
     case PIX_FMT_BGR24:      return yuv2rgb_c_24_bgr;
     case PIX_FMT_RGB565: