summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstefano <stefano@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-01-16 18:36:21 +0000
committerstefano <stefano@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-01-16 18:36:21 +0000
commit5d8bd54019d182aafcaa69d6cd519af31bacbc20 (patch)
tree6f0d6c54bf209360f5bf117220178f582c2f9db0
parentf65ce5d163ea45a4c4734e060968b3b4f5f1f66a (diff)
downloadmpv-5d8bd54019d182aafcaa69d6cd519af31bacbc20.tar.bz2
mpv-5d8bd54019d182aafcaa69d6cd519af31bacbc20.tar.xz
Factorize code which logs the source and destination formats in
sws_getContext(). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30326 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--libswscale/swscale.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/libswscale/swscale.c b/libswscale/swscale.c
index 71786b817a..9f1b9fd24c 100644
--- a/libswscale/swscale.c
+++ b/libswscale/swscale.c
@@ -2839,12 +2839,10 @@ SwsContext *sws_getContext(int srcW, int srcH, enum PixelFormat srcFormat, int d
else
av_log(c, AV_LOG_INFO, "ehh flags invalid?! ");
- if (dstFormat==PIX_FMT_BGR555 || dstFormat==PIX_FMT_BGR565)
- av_log(c, AV_LOG_INFO, "from %s to%s %s ",
- sws_format_name(srcFormat), dither, sws_format_name(dstFormat));
- else
- av_log(c, AV_LOG_INFO, "from %s to %s ",
- sws_format_name(srcFormat), sws_format_name(dstFormat));
+ av_log(c, AV_LOG_INFO, "from %s to%s %s ",
+ sws_format_name(srcFormat),
+ dstFormat == PIX_FMT_BGR555 || dstFormat == PIX_FMT_BGR565 ? dither : "",
+ sws_format_name(dstFormat));
if (flags & SWS_CPU_CAPS_MMX2)
av_log(c, AV_LOG_INFO, "using MMX2\n");