[FFmpeg-cvslog] r21600 - trunk/ffplay.c
stefano
subversion
Mon Feb 1 23:23:17 CET 2010
Author: stefano
Date: Mon Feb 1 23:23:17 2010
New Revision: 21600
Log:
Use parentheses around && within ||, fix the gcc warning:
ffplay.c: In function ?video_thread?:
ffplay.c:1391: warning: suggest parentheses around && within ||
Modified:
trunk/ffplay.c
Modified: trunk/ffplay.c
==============================================================================
--- trunk/ffplay.c Mon Feb 1 23:17:15 2010 (r21599)
+++ trunk/ffplay.c Mon Feb 1 23:23:17 2010 (r21600)
@@ -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;
More information about the ffmpeg-cvslog
mailing list