[FFmpeg-cvslog] r11682 - trunk/libavformat/mpegenc.c

bcoudurier subversion
Thu Jan 31 01:25:40 CET 2008


Author: bcoudurier
Date: Thu Jan 31 01:25:40 2008
New Revision: 11682

Log:
add parenthesis, fix warning: mpegenc.c:303: warning: suggest parentheses around && within ||

Modified:
   trunk/libavformat/mpegenc.c

Modified: trunk/libavformat/mpegenc.c
==============================================================================
--- trunk/libavformat/mpegenc.c	(original)
+++ trunk/libavformat/mpegenc.c	Thu Jan 31 01:25:40 2008
@@ -299,9 +299,9 @@ static int mpeg_mux_init(AVFormatContext
     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)




More information about the ffmpeg-cvslog mailing list