Mercurial > libavcodec.hg
comparison utils.c @ 10201:1b2ef85867a9 libavcodec
Add parentheses to logical expression to avoid the warning:
libavcodec/utils.c:476: warning: suggest parentheses around && within ||
| author | diego |
|---|---|
| date | Sun, 20 Sep 2009 18:29:48 +0000 |
| parents | 0ac7e80ecc76 |
| children | bd1c4a438c7f |
comparison
equal
deleted
inserted
replaced
| 10200:77eea98ffac3 | 10201:1b2ef85867a9 |
|---|---|
| 470 avcodec_set_dimensions(avctx, avctx->coded_width, avctx->coded_height); | 470 avcodec_set_dimensions(avctx, avctx->coded_width, avctx->coded_height); |
| 471 else if(avctx->width && avctx->height) | 471 else if(avctx->width && avctx->height) |
| 472 avcodec_set_dimensions(avctx, avctx->width, avctx->height); | 472 avcodec_set_dimensions(avctx, avctx->width, avctx->height); |
| 473 | 473 |
| 474 #define SANE_NB_CHANNELS 128U | 474 #define SANE_NB_CHANNELS 128U |
| 475 if((avctx->coded_width||avctx->coded_height) && avcodec_check_dimensions(avctx,avctx->coded_width,avctx->coded_height) || | 475 if (((avctx->coded_width || avctx->coded_height) |
| 476 avctx->channels > SANE_NB_CHANNELS) { | 476 && avcodec_check_dimensions(avctx, avctx->coded_width, avctx->coded_height)) |
| 477 || avctx->channels > SANE_NB_CHANNELS) { | |
| 477 av_freep(&avctx->priv_data); | 478 av_freep(&avctx->priv_data); |
| 478 ret = AVERROR(EINVAL); | 479 ret = AVERROR(EINVAL); |
| 479 goto end; | 480 goto end; |
| 480 } | 481 } |
| 481 | 482 |
