From 40461e54cef6e678848005acfcd697a0f53958d0 Mon Sep 17 00:00:00 2001
From: Diego Biurrun <diego@biurrun.de>
Date: Sun, 20 Sep 2009 18:29:48 +0000
Subject: [PATCH] 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
---
libavcodec/utils.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index e22bc3302e1..1ec039e5e99 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;
--
GitLab