# HG changeset patch # User stefano # Date 1262478169 0 # Node ID 0d34fd3b0db80d7848d7863eb70ccec458c261f2 # Parent a8283bcc8d2e845c0f295583836ee22f94fc2630 Simplify usePal() macro, make it use av_pix_fmt_descriptors. diff -r a8283bcc8d2e -r 0d34fd3b0db8 libswscale/swscale.c --- a/libswscale/swscale.c Sun Jan 03 00:09:24 2010 +0000 +++ b/libswscale/swscale.c Sun Jan 03 00:22:49 2010 +0000 @@ -188,13 +188,7 @@ || 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<