From a8e3815db5095fc52b9bd8637fc19cb638bd3aad Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Wed, 26 Sep 2012 22:52:33 +0200
Subject: [PATCH] lavf: factorize timestamp shift in
update_initial_timestamps()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---
libavformat/utils.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 5cb380a9541..83b2d269f88 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -940,24 +940,26 @@ static void update_initial_timestamps(AVFormatContext *s, int stream_index,
{
AVStream *st= s->streams[stream_index];
AVPacketList *pktl= s->parse_queue ? s->parse_queue : s->packet_buffer;
+ int64_t shift;
if(st->first_dts != AV_NOPTS_VALUE || dts == AV_NOPTS_VALUE || st->cur_dts == AV_NOPTS_VALUE || is_relative(dts))
return;
st->first_dts= dts - (st->cur_dts - RELATIVE_TS_BASE);
st->cur_dts= dts;
+ shift = st->first_dts - RELATIVE_TS_BASE;
if (is_relative(pts))
- pts += st->first_dts - RELATIVE_TS_BASE;
+ pts += shift;
for(; pktl; pktl= get_next_pkt(s, st, pktl)){
if(pktl->pkt.stream_index != stream_index)
continue;
if(is_relative(pktl->pkt.pts))
- pktl->pkt.pts += st->first_dts - RELATIVE_TS_BASE;
+ pktl->pkt.pts += shift;
if(is_relative(pktl->pkt.dts))
- pktl->pkt.dts += st->first_dts - RELATIVE_TS_BASE;
+ pktl->pkt.dts += shift;
if(st->start_time == AV_NOPTS_VALUE && pktl->pkt.pts != AV_NOPTS_VALUE)
st->start_time= pktl->pkt.pts;
--
GitLab