diff options
author | Simon Thelen <ffmpeg-dev@c-14.de> | 2015-11-22 15:03:17 +0100 |
---|---|---|
committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-12-05 04:24:22 +0100 |
commit | 5b6c0fdb4316ef71ef151e8b0f9137fe64877589 (patch) | |
tree | 02c7f42055074ed33bb93eccf3ccd58d8ee8e253 /ffmpeg.c | |
parent | 293c170f59414647b9bba9cb4602eb92989fd4ba (diff) | |
download | ffmpeg-5b6c0fdb4316ef71ef151e8b0f9137fe64877589.tar.gz |
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 <ffmpeg-dev@c-14.de>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'ffmpeg.c')
-rw-r--r-- | ffmpeg.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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); |