OSDN Git Service

Add parentheses in boolean expression: (A && B || C) => ((A && B) || C),
authorStefano Sabatini <stefano.sabatini-lala@poste.it>
Sat, 6 Feb 2010 00:10:42 +0000 (00:10 +0000)
committerStefano Sabatini <stefano.sabatini-lala@poste.it>
Sat, 6 Feb 2010 00:10:42 +0000 (00:10 +0000)
fix the warning:
ffmpeg.c: In function ‘output_packet’:
ffmpeg.c:1317: warning: suggest parentheses around && within ||

Originally committed as revision 21650 to svn://svn.ffmpeg.org/ffmpeg/trunk

ffmpeg.c

index cc88dfb..2d0f7f2 100644 (file)
--- 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;
         }