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:
db32349
)
Merge two if (got_picture) {} blocks in ffplay.c:get_video_frame().
author
Stefano Sabatini
<stefano.sabatini-lala@poste.it>
Sun, 16 Jan 2011 17:17:00 +0000
(18:17 +0100)
committer
Stefano Sabatini
<stefano.sabatini-lala@poste.it>
Mon, 17 Jan 2011 21:31:11 +0000
(22:31 +0100)
ffplay.c
patch
|
blob
|
history
diff --git
a/ffplay.c
b/ffplay.c
index
b2a1d45
..
2a2e823
100644
(file)
--- a/
ffplay.c
+++ b/
ffplay.c
@@
-1588,9
+1588,7
@@
static int get_video_frame(VideoState *is, AVFrame *frame, int64_t *pts, AVPacke
if (*pts == AV_NOPTS_VALUE) {
*pts = 0;
}
- }
- if (got_picture){
is->skip_frames_index += 1;
if(is->skip_frames_index >= is->skip_frames){
is->skip_frames_index -= FFMAX(is->skip_frames, 1.0);