[FFmpeg-cvslog] r30329 - trunk/libswscale/swscale.c

[stefano]

Author: stefano
Date: Sat Jan 16 20:11:03 2010
New Revision: 30329

Log:
Simplify code in sws_getContext() which logs if the destination format
support dithering, remove the const char *dither variable and use a
literal string instead.

Modified:
   trunk/libswscale/swscale.c

Modified: trunk/libswscale/swscale.c
==============================================================================
--- trunk/libswscale/swscale.c	Sat Jan 16 20:04:55 2010	(r30328)
+++ trunk/libswscale/swscale.c	Sat Jan 16 20:11:03 2010	(r30329)
@@ -2809,11 +2809,6 @@ SwsContext *sws_getContext(int srcW, int
     assert(c->chrDstH <= dstH);
 
     if (flags&SWS_PRINT_INFO) {
-#ifdef DITHER1XBPP
-        const char *dither= " dithered";
-#else
-        const char *dither= "";
-#endif
         if (flags&SWS_FAST_BILINEAR)
             av_log(c, AV_LOG_INFO, "FAST_BILINEAR scaler, ");
         else if (flags&SWS_BILINEAR)
@@ -2841,7 +2836,11 @@ SwsContext *sws_getContext(int srcW, int
 
         av_log(c, AV_LOG_INFO, "from %s to%s %s ",
                sws_format_name(srcFormat),
-               dstFormat == PIX_FMT_BGR555 || dstFormat == PIX_FMT_BGR565 ? dither : "",
+#ifdef DITHER1XBPP
+               dstFormat == PIX_FMT_BGR555 || dstFormat == PIX_FMT_BGR565 ? " dithered" : "",
+#else
+               "",
+#endif
                sws_format_name(dstFormat));
 
         if (flags & SWS_CPU_CAPS_MMX2)