From 3e906f4cfb15738b4c0cb56bad64531620af4818 Mon Sep 17 00:00:00 2001 From: Stefano Sabatini Date: Sat, 16 Jan 2010 11:08:16 +0000 Subject: [PATCH] Simplify reset_ptr(): employ usePal() macro rather than enumerating all the paletted formats. Originally committed as revision 30317 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale --- libswscale/swscale.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/libswscale/swscale.c b/libswscale/swscale.c index 15071ea218..71786b817a 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -2935,12 +2935,8 @@ static void reset_ptr(const uint8_t* src[], int format) src[3]=NULL; if(!isPlanarYUV(format)) { src[3]=src[2]=NULL; - if( format != PIX_FMT_PAL8 - && format != PIX_FMT_RGB8 - && format != PIX_FMT_BGR8 - && format != PIX_FMT_RGB4_BYTE - && format != PIX_FMT_BGR4_BYTE - ) + + if (!usePal(format)) src[1]= NULL; } }