This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit 3aa5d957d18d971b2680a6a72803e5f617525e87 Author: Nicolas Dato <[email protected]> AuthorDate: Mon Mar 2 15:40:32 2026 -0300 Commit: stevenliu <[email protected]> CommitDate: Wed Apr 29 23:54:37 2026 +0000 avformat/dashdec: fix previous commit where I inadvertently removed the case when calc_next_seg_no_from_timelines returned -1 and move_timelines wasn't called Signed-off-by: Nicolas Dato <[email protected]> --- libavformat/dashdec.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/dashdec.c b/libavformat/dashdec.c index 5e24247d76..1daa0d4ce5 100644 --- a/libavformat/dashdec.c +++ b/libavformat/dashdec.c @@ -317,7 +317,7 @@ static int64_t calc_next_seg_no_from_timelines(struct representation *pls, int64 num++; } - return pls->first_seq_no; + return -1; finish: return num + pls->first_seq_no; @@ -1449,6 +1449,8 @@ static int64_t calc_cur_seg_no(AVFormatContext *s, struct representation *pls) av_log(s, AV_LOG_TRACE, "in n_timelines mode\n"); start_time_offset = get_segment_start_time_based_on_timeline(pls, 0xFFFFFFFF) - 60 * pls->fragment_timescale; // 60 seconds before end num = calc_next_seg_no_from_timelines(pls, start_time_offset); + if (num == -1) + num = pls->first_seq_no; } else if (pls->fragment_duration){ av_log(s, AV_LOG_TRACE, "in fragment_duration mode fragment_timescale = %"PRId64", presentation_timeoffset = %"PRId64"\n", pls->fragment_timescale, pls->presentation_timeoffset); if (pls->presentation_timeoffset) { _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
