diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2023-04-20 15:17:28 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2023-04-25 20:44:23 +0100 |
| commit | f7d64881f87d66489e1f51b48d909d044203cc42 (patch) | |
| tree | 053c58f52683866c45fbc15249d1bf8efcc9e0e1 /libavformat | |
| parent | 8b0ec740cb9f6f30b4ec3d68d5bd871760fc80f3 (diff) | |
| download | ffmpeg-f7d64881f87d66489e1f51b48d909d044203cc42.tar.gz | |
mov: Do not blindly disable advanced edit lists if use_mfra_for is set
This was a bug/mistake in dae3679a9bfa421829ef9049ae2167089a2fdef7.
use_mfra_for by defintion only has an effect on fragmented MP4 files,
making the check not only redundant, but also broken if a user used
the option globally (i.e. set on non-fragmented MP4s).
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/mov.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index 1b3c1d7683..9fdeef057e 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -4650,12 +4650,8 @@ static int mov_read_trak(MOVContext *c, AVIOContext *pb, MOVAtom atom) * Advanced edit list support does not work with fragemented MP4s, which * have stsc, stsz, stco, and stts with zero entries in the moov atom. * In these files, trun atoms may be streamed in. - * - * It cannot be used with use_mfra_for = {pts,dts} either, as the index - * is not complete, but filled in as more trun atoms are read, as well. */ - if (!sc->stts_count || c->use_mfra_for != FF_MOV_FLAG_MFRA_AUTO && - c->advanced_editlist) { + if (!sc->stts_count && c->advanced_editlist) { av_log(c->fc, AV_LOG_VERBOSE, "advanced_editlist does not work with fragmented " "MP4. disabling.\n"); |