diff options
| author | Diego Biurrun <diego@biurrun.de> | 2009-09-20 18:29:48 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2009-09-20 18:29:48 +0000 |
| commit | 40461e54cef6e678848005acfcd697a0f53958d0 (patch) | |
| tree | 0a85687ec138461b431709dfaa13abc92326edbd | |
| parent | a79b4b75f78058dba96ab707b1e97631986a62a8 (diff) | |
| download | ffmpeg-40461e54cef6e678848005acfcd697a0f53958d0.tar.gz | |
Add parentheses to logical expression to avoid the warning:
libavcodec/utils.c:476: warning: suggest parentheses around && within ||
Originally committed as revision 19933 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/utils.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index e22bc3302e..1ec039e5e9 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -472,8 +472,9 @@ int attribute_align_arg avcodec_open(AVCodecContext *avctx, AVCodec *codec) avcodec_set_dimensions(avctx, avctx->width, avctx->height); #define SANE_NB_CHANNELS 128U - if((avctx->coded_width||avctx->coded_height) && avcodec_check_dimensions(avctx,avctx->coded_width,avctx->coded_height) || - avctx->channels > SANE_NB_CHANNELS) { + if (((avctx->coded_width || avctx->coded_height) + && avcodec_check_dimensions(avctx, avctx->coded_width, avctx->coded_height)) + || avctx->channels > SANE_NB_CHANNELS) { av_freep(&avctx->priv_data); ret = AVERROR(EINVAL); goto end; |