From e786fb79c5a57badc6b9f02d54a9a3c0e54e8ff3 Mon Sep 17 00:00:00 2001 From: stefano Date: Sun, 3 Jan 2010 00:22:49 +0000 Subject: Simplify usePal() macro, make it use av_pix_fmt_descriptors. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30172 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libswscale/swscale.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/libswscale/swscale.c b/libswscale/swscale.c index 9f81a8b3a8..12bc60850d 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -188,13 +188,7 @@ const char * swscale_license(void) || isRGB(x) \ || isBGR(x) \ ) -#define usePal(x) ( \ - (x)==PIX_FMT_PAL8 \ - || (x)==PIX_FMT_BGR4_BYTE \ - || (x)==PIX_FMT_RGB4_BYTE \ - || (x)==PIX_FMT_BGR8 \ - || (x)==PIX_FMT_RGB8 \ - ) +#define usePal(x) (av_pix_fmt_descriptors[x].flags & PIX_FMT_PAL) #define RGB2YUV_SHIFT 15 #define BY ( (int)(0.114*219/255*(1<