Merge two if conditions, allow to decrese the level of indentation of

the block.


git-svn-id: file:///var/local/repositories/mplayer/trunk/libswscale@30641 b3059339-0415-0410-9bf9-f77b7e298cf2

utils.c

@@ -1566,17 +1566,17 @@ struct SwsContext *sws_getCachedContext(struct SwsContext *context,
     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,