diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2008-01-31 00:25:40 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2008-01-31 00:25:40 +0000 |
| commit | 87be0d1289c97db4fa4fc946316951236e9201ad (patch) | |
| tree | cda1894b65e51c605af3e6209264124dd97e51e9 /libavformat/mpegenc.c | |
| parent | 3dc761a443a781ae35a6b1023f4454db0ffe5723 (diff) | |
| download | ffmpeg-87be0d1289c97db4fa4fc946316951236e9201ad.tar.gz | |
add parenthesis, fix warning: mpegenc.c:303: warning: suggest parentheses around && within ||
Originally committed as revision 11682 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/mpegenc.c')
| -rw-r--r-- | libavformat/mpegenc.c | 6 |
1 files 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) |