Commit 7521ca2ca6 for ffmpeg
commit 7521ca2ca6d7ddb9ec363d7abe26b3dcc095bd3a
Author: Michael Niedermayer <michael@niedermayer.cc>
Date: Sat Oct 10 06:45:00 2026 +0200
avformat/sbgdec: fix the timestamps of the events expanded from blocks
Found during triage/review of OSS-Fuzz issue 474457174
Fixes: QLpKsyxye22s
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
diff --git a/libavformat/sbgdec.c b/libavformat/sbgdec.c
index 9920007d7f..24f7d5161d 100644
--- a/libavformat/sbgdec.c
+++ b/libavformat/sbgdec.c
@@ -549,7 +549,7 @@ static int parse_time_sequence(struct sbg_parser *p, int inblock)
if (av_sat_add64(p->current_time.t, rel_ts) != p->current_time.t + (uint64_t)rel_ts)
return AVERROR_INVALIDDATA;
- ts.t = p->current_time.t + rel_ts;
+ ts.t = inblock ? rel_ts : p->current_time.t + rel_ts;
r = parse_fade(p, &fade);
if (r < 0)
return r;
@@ -989,7 +989,7 @@ static int expand_tseq(void *log, struct sbg_script *s, int *nb_ev_max,
&s->nb_events, nb_ev_max);
if (!ev)
return AVERROR(ENOMEM);
- ev->ts = tseq->ts.t;
+ ev->ts = t0;
ev->elements = def->elements;
ev->nb_elements = def->nb_elements;
ev->fade = tseq->fade;