From f412d5e97aadf184c67f721fd8a07acdefad2a78 Mon Sep 17 00:00:00 2001 From: Stefano Sabatini Date: Sun, 3 Jan 2010 00:22:49 +0000 Subject: [PATCH] Simplify usePal() macro, make it use av_pix_fmt_descriptors. Originally committed as revision 30172 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale --- 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<