Mercurial > mplayer.hg

changeset 30599:7c1fea45bfc8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge two if conditions, allow to decrese the level of indentation of the block.
author stefano
date Thu, 18 Feb 2010 21:12:05 +0000
parents a9eac13b820a
children e2935c75f1aa
files libswscale/utils.c
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/libswscale/utils.c	Thu Feb 18 20:24:52 2010 +0000
+++ b/libswscale/utils.c	Thu Feb 18 21:12:05 2010 +0000
@@ -1566,17 +1566,17 @@
     if (!param)
         param = default_param;
 
-    if (context) {
-        if (context->srcW != srcW || context->srcH != srcH ||
+    if (context &&
+        (context->srcW != srcW || context->srcH != srcH ||
             context->srcFormat != srcFormat ||
             context->dstW != dstW || context->dstH != dstH ||
             context->dstFormat != dstFormat || context->flags != flags ||
-            context->param[0] != param[0] || context->param[1] != param[1])
+            context->param[0] != param[0] || context->param[1] != param[1]))
         {
             sws_freeContext(context);
             context = NULL;
         }
-    }
+
     if (!context) {
         return sws_getContext(srcW, srcH, srcFormat,
                               dstW, dstH, dstFormat, flags,