virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

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

Browse Source 
the block.

Originally committed as revision 30641 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
This commit is contained in:
Stefano Sabatini 2010-02-18 21:12:05 +00:00
parent 13887093fa
commit 5a011d8b08
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libswscale/utils.c
View File

@ -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,