Mercurial > mplayer.hg

comparison libswscale/utils.c @ 30599:7c1fea45bfc8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge two if conditions, allow to decrese the level of indentation of the block.
author stefano
date Thu, 18 Feb 2010 21:12:05 +0000
parents 838bbf6bc6ff
children e2935c75f1aa
comparison
equal deleted inserted replaced
30598:a9eac13b820a 30599:7c1fea45bfc8
1564 static const double default_param[2] = {SWS_PARAM_DEFAULT, SWS_PARAM_DEFAULT}; 1564 static const double default_param[2] = {SWS_PARAM_DEFAULT, SWS_PARAM_DEFAULT};
1565 1565
1566 if (!param) 1566 if (!param)
1567 param = default_param; 1567 param = default_param;
1568 1568
1569 if (context) { 1569 if (context &&
1570 if (context->srcW != srcW || context->srcH != srcH || 1570 (context->srcW != srcW || context->srcH != srcH ||
1571 context->srcFormat != srcFormat || 1571 context->srcFormat != srcFormat ||
1572 context->dstW != dstW || context->dstH != dstH || 1572 context->dstW != dstW || context->dstH != dstH ||
1573 context->dstFormat != dstFormat || context->flags != flags || 1573 context->dstFormat != dstFormat || context->flags != flags ||
1574 context->param[0] != param[0] || context->param[1] != param[1]) 1574 context->param[0] != param[0] || context->param[1] != param[1]))
1575 { 1575 {
1576 sws_freeContext(context); 1576 sws_freeContext(context);
1577 context = NULL; 1577 context = NULL;
1578 } 1578 }
1579 } 1579
1580 if (!context) { 1580 if (!context) {
1581 return sws_getContext(srcW, srcH, srcFormat, 1581 return sws_getContext(srcW, srcH, srcFormat,
1582 dstW, dstH, dstFormat, flags, 1582 dstW, dstH, dstFormat, flags,
1583 srcFilter, dstFilter, param); 1583 srcFilter, dstFilter, param);
1584 } 1584 }