Commit 5a011d8b authored by Stefano Sabatini's avatar Stefano Sabatini
Browse files

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
parent 13887093
...@@ -1566,17 +1566,17 @@ struct SwsContext *sws_getCachedContext(struct SwsContext *context, ...@@ -1566,17 +1566,17 @@ struct SwsContext *sws_getCachedContext(struct SwsContext *context,
if (!param) if (!param)
param = default_param; param = default_param;
if (context) { if (context &&
if (context->srcW != srcW || context->srcH != srcH || (context->srcW != srcW || context->srcH != srcH ||
context->srcFormat != srcFormat || context->srcFormat != srcFormat ||
context->dstW != dstW || context->dstH != dstH || context->dstW != dstW || context->dstH != dstH ||
context->dstFormat != dstFormat || context->flags != flags || 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); sws_freeContext(context);
context = NULL; context = NULL;
} }
}
if (!context) { if (!context) {
return sws_getContext(srcW, srcH, srcFormat, return sws_getContext(srcW, srcH, srcFormat,
dstW, dstH, dstFormat, flags, dstW, dstH, dstFormat, flags,
......
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