aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2024-11-15 20:14:37 -0300
committerJames Almer <jamrial@gmail.com>2024-11-22 20:50:05 -0300
commitecc7d5db9c8a1aaccc876dc4b549558eadfe140a (patch)
tree6fe46621d7e070c4f76cc9a7462e1bf5053fad6c
parent865c73c86f9d9d167be7e41ad6cef71eba92dadd (diff)
downloadffmpeg-ecc7d5db9c8a1aaccc876dc4b549558eadfe140a.tar.gz
avformat/movenc: don't disable edit lists when writing CMAF outputHEADmaster
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 <jamrial@gmail.com>
-rw-r--r--libavformat/movenc.c8
1 files changed, 0 insertions, 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;