diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-02-18 21:12:05 +0000 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-02-18 21:12:05 +0000 |
| commit | 5a011d8b0826408b9d5e839722efff83e3de57d0 (patch) | |
| tree | 16ec5cf35f2689ca3084bd7cd54d11bafa70a71a /libswscale | |
| parent | 13887093fab29cde8b2a76a663013f4f7c427975 (diff) | |
| download | ffmpeg-5a011d8b0826408b9d5e839722efff83e3de57d0.tar.gz | |
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
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, |