[SCM] libav/experimental: Add parentheses to logical expression to avoid the warning: libavcodec/utils.c:476: warning: suggest parentheses around && within ||

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 40461e54cef6e678848005acfcd697a0f53958d0
Author: Diego Biurrun <diego at biurrun.de>
Date:   Sun Sep 20 18:29:48 2009 +0000

    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

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index e22bc33..1ec039e 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;

-- 
Libav/FFmpeg packaging