From 6e2fdc3eb149403520bd299e3630a655d0aca851 Mon Sep 17 00:00:00 2001 From: Stefano Sabatini Date: Sat, 6 Feb 2010 00:10:42 +0000 Subject: Add parentheses in boolean expression: (A && B || C) => ((A && B) || C), fix the warning: ffmpeg.c: In function ‘output_packet’: ffmpeg.c:1317: warning: suggest parentheses around && within || MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Originally committed as revision 21650 to svn://svn.ffmpeg.org/ffmpeg/trunk --- ffmpeg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ffmpeg.c') diff --git a/ffmpeg.c b/ffmpeg.c index cc88dfb087..2d0f7f2aa8 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -1314,7 +1314,7 @@ static int output_packet(AVInputStream *ist, int ist_index, ist->pts= ist->next_pts; if(avpkt.size && avpkt.size != pkt->size && - (!ist->showed_multi_packet_warning && verbose>0 || verbose>1)){ + ((!ist->showed_multi_packet_warning && verbose>0) || verbose>1)){ fprintf(stderr, "Multiple frames in a packet from stream %d\n", pkt->stream_index); ist->showed_multi_packet_warning=1; } -- cgit v1.2.3