Commit 514f3741 authored by stefano's avatar stefano

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.


git-svn-id: file:///var/local/repositories/mplayer/trunk/libswscale@30329 b3059339-0415-0410-9bf9-f77b7e298cf2
parent 96fbbff8
...@@ -2809,11 +2809,6 @@ SwsContext *sws_getContext(int srcW, int srcH, enum PixelFormat srcFormat, int d ...@@ -2809,11 +2809,6 @@ SwsContext *sws_getContext(int srcW, int srcH, enum PixelFormat srcFormat, int d
assert(c->chrDstH <= dstH); assert(c->chrDstH <= dstH);
if (flags&SWS_PRINT_INFO) { if (flags&SWS_PRINT_INFO) {
#ifdef DITHER1XBPP
const char *dither= " dithered";
#else
const char *dither= "";
#endif
if (flags&SWS_FAST_BILINEAR) if (flags&SWS_FAST_BILINEAR)
av_log(c, AV_LOG_INFO, "FAST_BILINEAR scaler, "); av_log(c, AV_LOG_INFO, "FAST_BILINEAR scaler, ");
else if (flags&SWS_BILINEAR) else if (flags&SWS_BILINEAR)
...@@ -2841,7 +2836,11 @@ SwsContext *sws_getContext(int srcW, int srcH, enum PixelFormat srcFormat, int d ...@@ -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 ", av_log(c, AV_LOG_INFO, "from %s to%s %s ",
sws_format_name(srcFormat), 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)); sws_format_name(dstFormat));
if (flags & SWS_CPU_CAPS_MMX2) if (flags & SWS_CPU_CAPS_MMX2)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment