summaryrefslogtreecommitdiff
path: root/ffplay.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2010-02-01 12:30:14 +0000
committerMichael Niedermayer <michaelni@gmx.at>2010-02-01 12:30:14 +0000
commitacf24b870f2a2c50b559487201e951e62d9d09ab (patch)
tree4f188598ff5e959547d75e11bcc1f1af0097cd52 /ffplay.c
parent967030eb24074919f0363e53823cf54d89d12dda (diff)
Move frame_last_delay into flush code as it must be reset on seeks to,
otherwise the first frame after a seek would be delayed by that amount. Originally committed as revision 21591 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffplay.c')
-rw-r--r--ffplay.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ffplay.c b/ffplay.c
index 122459abe6..206a763fb3 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -1363,6 +1363,7 @@ static int video_thread(void *arg)
is->last_dts_for_fault_detection=
is->last_pts_for_fault_detection= INT64_MIN;
is->frame_last_pts= AV_NOPTS_VALUE;
+ is->frame_last_delay = 40e-3;
continue;
}
@@ -1812,7 +1813,6 @@ static int stream_component_open(VideoState *is, int stream_index)
is->video_stream = stream_index;
is->video_st = ic->streams[stream_index];
- is->frame_last_delay = 40e-3;
is->frame_timer = (double)av_gettime() / 1000000.0;
// is->video_current_pts_time = av_gettime();