[FFmpeg-cvslog] r21650 - trunk/ffmpeg.c

[stefano]

Author: stefano
Date: Sat Feb  6 01:10:42 2010
New Revision: 21650

Log:
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 ||

Modified:
   trunk/ffmpeg.c

Modified: trunk/ffmpeg.c
==============================================================================
--- trunk/ffmpeg.c	Sat Feb  6 01:05:38 2010	(r21649)
+++ trunk/ffmpeg.c	Sat Feb  6 01:10:42 2010	(r21650)
@@ -1314,7 +1314,7 @@ static int output_packet(AVInputStream *
         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;
         }