From 5a011d8b0826408b9d5e839722efff83e3de57d0 Mon Sep 17 00:00:00 2001 From: Stefano Sabatini Date: Thu, 18 Feb 2010 21:12:05 +0000 Subject: Merge two if conditions, allow to decrese the level of indentation of the block. Originally committed as revision 30641 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale --- libswscale/utils.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libswscale') diff --git a/libswscale/utils.c b/libswscale/utils.c index eebd40c79a..eb690740fd 100644 --- a/libswscale/utils.c +++ b/libswscale/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, -- cgit v1.2.3