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;