From 307b6502701b93a8dad82756d91370e1233adb2d Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 6 Nov 2011 13:26:50 +0100 Subject: swscale: Fix packed rgb check for planarRgbToRgbWrapper. Signed-off-by: Michael Niedermayer --- libswscale/swscale_unscaled.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'libswscale') diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c index b5d3e76f1c..90603c2280 100644 --- a/libswscale/swscale_unscaled.c +++ b/libswscale/swscale_unscaled.c @@ -694,7 +694,15 @@ void ff_get_unscaled_swscale(SwsContext *c) && (!needsDither || (c->flags&(SWS_FAST_BILINEAR|SWS_POINT)))) c->swScale= rgbToRgbWrapper; - if (isAnyRGB(srcFormat) && isPlanar(srcFormat) && isAnyRGB(dstFormat) && !isPlanar(dstFormat)) +#define isByteRGB(f) (\ + f == PIX_FMT_RGB32 ||\ + f == PIX_FMT_RGB32_1 ||\ + f == PIX_FMT_RGB24 ||\ + f == PIX_FMT_BGR32 ||\ + f == PIX_FMT_BGR32_1 ||\ + f == PIX_FMT_BGR24) + + if (isAnyRGB(srcFormat) && isPlanar(srcFormat) && isByteRGB(dstFormat)) c->swScale= planarRgbToRgbWrapper; if ((usePal(srcFormat) && ( -- cgit v1.2.3