aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefano Sabatini <stefano.sabatini-lala@poste.it>2010-02-01 22:23:17 +0000
committerStefano Sabatini <stefano.sabatini-lala@poste.it>2010-02-01 22:23:17 +0000
commitecbed31c0029ffec61e325a0136efaba1198f97d (patch)
tree80787c746a66c1e57856d7292a492453e257e406
parentdf7d6e484c31b4359e70403a41c4e39550fe9713 (diff)
downloadffmpeg-ecbed31c0029ffec61e325a0136efaba1198f97d.tar.gz
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
-rw-r--r--ffplay.c2
1 files changed, 1 insertions, 1 deletions
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_pts<is->faulty_dts
+ || (decoder_reorder_pts && is->faulty_pts<is->faulty_dts)
|| pkt->dts == AV_NOPTS_VALUE)
&& frame->reordered_opaque != AV_NOPTS_VALUE)
pts= frame->reordered_opaque;