virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

mov: Do not blindly disable advanced edit lists if use_mfra_for is set

Browse Source 
This was a bug/mistake in dae3679a9b.

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>
This commit is contained in:
Derek Buitenhuis
2023-04-20 15:17:28 +01:00
parent 8b0ec740cb
commit f7d64881f8
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/mov.c
View File

@@ -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 * Advanced edit list support does not work with fragemented MP4s, which
* have stsc, stsz, stco, and stts with zero entries in the moov atom. * have stsc, stsz, stco, and stts with zero entries in the moov atom.
* In these files, trun atoms may be streamed in. * 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 && if (!sc->stts_count && c->advanced_editlist) {
c->advanced_editlist) {
av_log(c->fc, AV_LOG_VERBOSE, "advanced_editlist does not work with fragmented " av_log(c->fc, AV_LOG_VERBOSE, "advanced_editlist does not work with fragmented "
"MP4. disabling.\n"); "MP4. disabling.\n");