From 87be0d1289c97db4fa4fc946316951236e9201ad Mon Sep 17 00:00:00 2001 From: Baptiste Coudurier Date: Thu, 31 Jan 2008 00:25:40 +0000 Subject: [PATCH] add parenthesis, fix warning: mpegenc.c:303: warning: suggest parentheses around && within || Originally committed as revision 11682 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/mpegenc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavformat/mpegenc.c b/libavformat/mpegenc.c index ca9d481978..83a628a5fb 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)