Commit 87be0d12 authored by Baptiste Coudurier's avatar Baptiste Coudurier

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

Originally committed as revision 11682 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 3dc761a4
......@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment