OSDN Git Service
(root)
/
coroid
/
libav_saccubus.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
df7d6e4
)
Use parentheses around && within ||, fix the gcc warning:
author
Stefano Sabatini
<stefano.sabatini-lala@poste.it>
Mon, 1 Feb 2010 22:23:17 +0000
(22:23 +0000)
committer
Stefano Sabatini
<stefano.sabatini-lala@poste.it>
Mon, 1 Feb 2010 22:23:17 +0000
(22:23 +0000)
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
ffplay.c
patch
|
blob
|
history
diff --git
a/ffplay.c
b/ffplay.c
index
f5286a4
..
33f91d3
100644
(file)
--- 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;