# HG changeset patch # User stefano # Date 1263669063 0 # Node ID 67cace3e3df762599401da47591c03fb8a63f963 # Parent e6e5a84fdecb709eef4cf604eb4a9eb0f992be76 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. diff -r e6e5a84fdecb -r 67cace3e3df7 libswscale/swscale.c --- a/libswscale/swscale.c Sat Jan 16 19:04:55 2010 +0000 +++ b/libswscale/swscale.c Sat Jan 16 19:11:03 2010 +0000 @@ -2809,11 +2809,6 @@ 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 @@ 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)