diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-01-16 19:11:03 +0000 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-01-16 19:11:03 +0000 |
| commit | a9e2878c48005eea2d7e7e285af5101608b79b43 (patch) | |
| tree | 319074fc5cbd3c8bcf9e74adbc323b8e641dca82 /libswscale/swscale.c | |
| parent | 9556124c97edac5093f75286f596486102cb6f77 (diff) | |
| download | ffmpeg-a9e2878c48005eea2d7e7e285af5101608b79b43.tar.gz | |
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.
Originally committed as revision 30329 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
Diffstat (limited to 'libswscale/swscale.c')
| -rw-r--r-- | libswscale/swscale.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/libswscale/swscale.c b/libswscale/swscale.c index 612b250c72..dc97389fd0 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -2809,11 +2809,6 @@ SwsContext *sws_getContext(int srcW, int srcH, enum PixelFormat srcFormat, int d 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 srcH, enum PixelFormat srcFormat, int d 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) |