[FFmpeg-cvslog] r30856 - in trunk/libswscale: swscale.c swscale_internal.h utils.c

stefano subversion
Sat Mar 6 12:50:54 CET 2010


Author: stefano
Date: Sat Mar  6 12:50:54 2010
New Revision: 30856

Log:
Avoid duplication of usePal() macro.

Modified:
   trunk/libswscale/swscale.c
   trunk/libswscale/swscale_internal.h
   trunk/libswscale/utils.c

Modified: trunk/libswscale/swscale.c
==============================================================================
--- trunk/libswscale/swscale.c	Sat Mar  6 12:27:31 2010	(r30855)
+++ trunk/libswscale/swscale.c	Sat Mar  6 12:50:54 2010	(r30856)
@@ -92,7 +92,6 @@ untested special converters
         || (x)==PIX_FMT_UYVY422     \
         || isAnyRGB(x)              \
     )
-#define usePal(x) (av_pix_fmt_descriptors[x].flags & PIX_FMT_PAL)
 
 #define RGB2YUV_SHIFT 15
 #define BY ( (int)(0.114*219/255*(1<<RGB2YUV_SHIFT)+0.5))

Modified: trunk/libswscale/swscale_internal.h
==============================================================================
--- trunk/libswscale/swscale_internal.h	Sat Mar  6 12:27:31 2010	(r30855)
+++ trunk/libswscale/swscale_internal.h	Sat Mar  6 12:50:54 2010	(r30856)
@@ -442,6 +442,7 @@ const char *sws_format_name(enum PixelFo
         || (x)==PIX_FMT_RGB32_1     \
         || (x)==PIX_FMT_YUVA420P    \
     )
+#define usePal(x) (av_pix_fmt_descriptors[x].flags & PIX_FMT_PAL)
 
 extern const uint64_t ff_dither4[2];
 extern const uint64_t ff_dither8[2];

Modified: trunk/libswscale/utils.c
==============================================================================
--- trunk/libswscale/utils.c	Sat Mar  6 12:27:31 2010	(r30855)
+++ trunk/libswscale/utils.c	Sat Mar  6 12:50:54 2010	(r30856)
@@ -150,8 +150,6 @@ int sws_isSupportedOutput(enum PixelForm
     return isSupportedOut(pix_fmt);
 }
 
-#define usePal(x) (av_pix_fmt_descriptors[x].flags & PIX_FMT_PAL)
-
 extern const int32_t ff_yuv2rgb_coeffs[8][4];
 
 const char *sws_format_name(enum PixelFormat format)



More information about the ffmpeg-cvslog mailing list