This is an automated email from the git hooks/post-receive script.

Git pushed a commit to branch master
in repository ffmpeg.

The following commit(s) were added to refs/heads/master by this push:
     new cf0244aa38 avformat/movenc: avoid negative cts offsets when using an 
edit list with CMAF output
cf0244aa38 is described below

commit cf0244aa38d73952e84f596715da2a3423dd7267
Author:     James Almer <[email protected]>
AuthorDate: Tue Jun 9 15:19:41 2026 -0300
Commit:     James Almer <[email protected]>
CommitDate: Wed Jun 10 18:14:42 2026 +0000

    avformat/movenc: avoid negative cts offsets when using an edit list with 
CMAF output
    
    Fixes issue #23417.
    
    Signed-off-by: James Almer <[email protected]>
---
 libavformat/movenc.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index b466ba7531..c85b76a3c7 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -8206,6 +8206,9 @@ static int mov_init(AVFormatContext *s)
         !(mov->flags & FF_MOV_FLAG_DELAY_MOOV) && mov->use_editlist)
         av_log(s, AV_LOG_WARNING, "No meaningful edit list will be written 
when using empty_moov without delay_moov\n");
 
+    if (mov->flags & FF_MOV_FLAG_CMAF && mov->use_editlist)
+        mov->flags &= ~FF_MOV_FLAG_NEGATIVE_CTS_OFFSETS;
+
     if (!mov->use_editlist && s->avoid_negative_ts == AVFMT_AVOID_NEG_TS_AUTO 
&&
         !(mov->flags & FF_MOV_FLAG_NEGATIVE_CTS_OFFSETS))
         s->avoid_negative_ts = AVFMT_AVOID_NEG_TS_MAKE_ZERO;

_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]

Reply via email to