Commit e5786f1f authored by stefano's avatar stefano

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


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@21650 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 31dddf7d
...@@ -1314,7 +1314,7 @@ static int output_packet(AVInputStream *ist, int ist_index, ...@@ -1314,7 +1314,7 @@ static int output_packet(AVInputStream *ist, int ist_index,
ist->pts= ist->next_pts; ist->pts= ist->next_pts;
if(avpkt.size && avpkt.size != pkt->size && 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); fprintf(stderr, "Multiple frames in a packet from stream %d\n", pkt->stream_index);
ist->showed_multi_packet_warning=1; ist->showed_multi_packet_warning=1;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment