From: Stefano Sabatini Date: Mon, 1 Feb 2010 22:23:17 +0000 (+0000) Subject: Use parentheses around && within ||, fix the gcc warning: X-Git-Tag: v0.6~1498 X-Git-Url: https://git.libav.org/?p=libav.git;a=commitdiff_plain;h=ecbed31c0029ffec61e325a0136efaba1198f97d;ds=sidebyside Use parentheses around && within ||, fix the gcc warning: ffplay.c: In function ‘video_thread’: ffplay.c:1391: warning: suggest parentheses around && within || Originally committed as revision 21600 to svn://svn.ffmpeg.org/ffmpeg/trunk --- diff --git a/ffplay.c b/ffplay.c index f5286a492f..33f91d3905 100644 --- a/ffplay.c +++ b/ffplay.c @@ -1387,7 +1387,7 @@ static int video_thread(void *arg) } if( ( decoder_reorder_pts==1 - || decoder_reorder_pts && is->faulty_ptsfaulty_dts + || (decoder_reorder_pts && is->faulty_ptsfaulty_dts) || pkt->dts == AV_NOPTS_VALUE) && frame->reordered_opaque != AV_NOPTS_VALUE) pts= frame->reordered_opaque;