aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefano Sabatini <stefano.sabatini-lala@poste.it>2010-02-06 00:10:42 +0000
committerStefano Sabatini <stefano.sabatini-lala@poste.it>2010-02-06 00:10:42 +0000
commit6e2fdc3eb149403520bd299e3630a655d0aca851 (patch)
tree3280ec0e744b10809e97a16aea425317e847ecb1
parent570da52bacbf778700adf83348a87b8a406d41df (diff)
downloadffmpeg-6e2fdc3eb149403520bd299e3630a655d0aca851.tar.gz
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 || Originally committed as revision 21650 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--ffmpeg.c2
1 files changed, 1 insertions, 1 deletions
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;
}