ffmpeg | branch: master | James Almer <jamr...@gmail.com> | Fri Nov 15 20:14:37 2024 -0300| [ecc7d5db9c8a1aaccc876dc4b549558eadfe140a] | committer: James Almer
avformat/movenc: don't disable edit lists when writing CMAF output They are needed for audio tracks with priming samples, where negative CTS offsets can't be used. Fixes ticket #11031. Signed-off-by: James Almer <jamr...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ecc7d5db9c8a1aaccc876dc4b549558eadfe140a --- libavformat/movenc.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 1488c173a7..da67bb3762 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -7675,19 +7675,11 @@ static int mov_init(AVFormatContext *s) s->avoid_negative_ts == AVFMT_AVOID_NEG_TS_MAKE_ZERO) mov->use_editlist = 0; } - if (mov->flags & FF_MOV_FLAG_CMAF) { - // CMAF Track requires negative cts offsets without edit lists - mov->use_editlist = 0; - } } if (mov->flags & FF_MOV_FLAG_EMPTY_MOOV && !(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) { - av_log(s, AV_LOG_WARNING, "Edit list enabled; Assuming writing CMAF Track File\n"); - 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 ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
