diff options
| author |  stefano <stefano@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-02-18 21:12:05 +0000 |
|---|---|---|
| committer | stefano <stefano@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-02-18 21:12:05 +0000 |
| commit | b07bf5bddc48ec4b79b6d10dadb1ec2f6ea848b7 (patch) | |
| tree | 15db202c14af33aef32f35bd46805dc5a57abb6b /libswscale | |
| parent | 134bbb8cd880698e08e13e1159c9c1cba6908ce4 (diff) | |
Merge two if conditions, allow to decrese the level of indentation of
the block.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30641 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libswscale')
| -rw-r--r-- | libswscale/utils.c | 8 |
1 files changed, 4 insertions, 4 deletions
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, |