summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-11-14 01:42:33 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-11-14 01:42:33 +0100
commit9406d6be55db25190b442ffdb2e6bc5d46904fb6 (patch)
tree6e7e7c87a7d0cc44e2145430e73d079863e6dc3c
parent2f74f8d7dce2baff3a4401130a8e479c2899fd16 (diff)
downloadffmpeg-9406d6be55db25190b442ffdb2e6bc5d46904fb6.tar.gz
ffmpeg: fix audio timestamps on stream copy with -ss
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--ffmpeg.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index effaf2f925..8f10304bae 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -1367,7 +1367,7 @@ static void do_streamcopy(InputStream *ist, OutputStream *ost, const AVPacket *p
duration = ist->st->codec->frame_size;
opkt.dts = opkt.pts = av_rescale_delta(ist->st->time_base, pkt->dts,
(AVRational){1, ist->st->codec->sample_rate}, duration, &ist->filter_in_rescale_delta_last,
- ost->st->time_base);
+ ost->st->time_base) - ost_tb_start_time;;
}
opkt.duration = av_rescale_q(pkt->duration, ist->st->time_base, ost->st->time_base);