Commit c329195a authored by Michael Niedermayer's avatar Michael Niedermayer

avformat/mux: use a local variable for offset

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 060f14f4
......@@ -499,14 +499,15 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt)
if (s->avoid_negative_ts > 0) {
AVStream *st = s->streams[pkt->stream_index];
int64_t offset = st->mux_ts_offset;
if (pkt->dts < 0 && pkt->dts != AV_NOPTS_VALUE && !s->offset) {
s->offset = -pkt->dts;
s->offset_timebase = st->time_base;
}
if (s->offset && !st->mux_ts_offset) {
st->mux_ts_offset =
if (s->offset && !offset) {
offset = st->mux_ts_offset =
av_rescale_q_rnd(s->offset,
s->offset_timebase,
st->time_base,
......@@ -514,9 +515,9 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt)
}
if (pkt->dts != AV_NOPTS_VALUE)
pkt->dts += st->mux_ts_offset;
pkt->dts += offset;
if (pkt->pts != AV_NOPTS_VALUE)
pkt->pts += st->mux_ts_offset;
pkt->pts += offset;
}
if (!(s->oformat->flags & (AVFMT_TS_NEGATIVE | AVFMT_NOTIMESTAMPS)) && 0) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment