[SCM] libav/experimental: add parenthesis, fix warning: mpegenc.c:303: warning: suggest parentheses around && within ||

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 87be0d1289c97db4fa4fc946316951236e9201ad
Author: Baptiste Coudurier <baptiste.coudurier at gmail.com>
Date:   Thu Jan 31 00:25:40 2008 +0000

    add parenthesis, fix warning: mpegenc.c:303: warning: suggest parentheses around && within ||
    
    Originally committed as revision 11682 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/mpegenc.c b/libavformat/mpegenc.c
index ca9d481..83a628a 100644
--- a/libavformat/mpegenc.c
+++ b/libavformat/mpegenc.c
@@ -299,9 +299,9 @@ static int mpeg_mux_init(AVFormatContext *ctx)
     s->packet_number = 0;
     s->is_vcd =   (ENABLE_MPEG1VCD_MUXER  && ctx->oformat == &mpeg1vcd_muxer);
     s->is_svcd =  (ENABLE_MPEG2SVCD_MUXER && ctx->oformat == &mpeg2svcd_muxer);
-    s->is_mpeg2 = (ENABLE_MPEG2VOB_MUXER  && ctx->oformat == &mpeg2vob_muxer ||
-                   ENABLE_MPEG2DVD_MUXER  && ctx->oformat == &mpeg2dvd_muxer ||
-                   ENABLE_MPEG2SVCD_MUXER && ctx->oformat == &mpeg2svcd_muxer);
+    s->is_mpeg2 = ((ENABLE_MPEG2VOB_MUXER  && ctx->oformat == &mpeg2vob_muxer) ||
+                   (ENABLE_MPEG2DVD_MUXER  && ctx->oformat == &mpeg2dvd_muxer) ||
+                   (ENABLE_MPEG2SVCD_MUXER && ctx->oformat == &mpeg2svcd_muxer));
     s->is_dvd =   (ENABLE_MPEG2DVD_MUXER  && ctx->oformat == &mpeg2dvd_muxer);
 
     if(ctx->packet_size)

-- 
Libav/FFmpeg packaging