From b13ba5cb9a1a56883f0a8e7f7b02f7a1330ccb6d Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 6 Nov 2011 13:30:10 +0100 Subject: swscale: use isByteRGB() to simplify check for palToRgbWrapper. Signed-off-by: Michael Niedermayer --- libswscale/swscale_unscaled.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'libswscale') diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c index 90603c2280..79cb74cfeb 100644 --- a/libswscale/swscale_unscaled.c +++ b/libswscale/swscale_unscaled.c @@ -705,13 +705,7 @@ void ff_get_unscaled_swscale(SwsContext *c) if (isAnyRGB(srcFormat) && isPlanar(srcFormat) && isByteRGB(dstFormat)) c->swScale= planarRgbToRgbWrapper; - if ((usePal(srcFormat) && ( - dstFormat == PIX_FMT_RGB32 || - dstFormat == PIX_FMT_RGB32_1 || - dstFormat == PIX_FMT_RGB24 || - dstFormat == PIX_FMT_BGR32 || - dstFormat == PIX_FMT_BGR32_1 || - dstFormat == PIX_FMT_BGR24))) + if (usePal(srcFormat) && isByteRGB(dstFormat)) c->swScale= palToRgbWrapper; if (srcFormat == PIX_FMT_YUV422P) { -- cgit v1.2.3