From 5b6c0fdb4316ef71ef151e8b0f9137fe64877589 Mon Sep 17 00:00:00 2001 From: Simon Thelen Date: Sun, 22 Nov 2015 15:03:17 +0100 Subject: ffmpeg: When streamcopying, only add the input seek position when copying timestamps. Using -ss as an input option shifts timestamps down by the seek, so it doesn't have to be added to the recording time when checking whether to stop. Fixes #977 Signed-off-by: Simon Thelen Signed-off-by: Michael Niedermayer --- ffmpeg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ffmpeg.c') diff --git a/ffmpeg.c b/ffmpeg.c index 82d9a6cbf1..a866f72084 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -1831,7 +1831,7 @@ static void do_streamcopy(InputStream *ist, OutputStream *ost, const AVPacket *p if (f->recording_time != INT64_MAX) { start_time = f->ctx->start_time; - if (f->start_time != AV_NOPTS_VALUE) + if (f->start_time != AV_NOPTS_VALUE && copy_ts) start_time += f->start_time; if (ist->pts >= f->recording_time + start_time) { close_output_stream(ost); -- cgit v1.2.3