github-mirrors/FFmpeg
1
0
Fork 0
mirror of https://mirror.skon.top/https://github.com/FFmpeg/FFmpeg synced 2026-04-20 21:00:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

avformat/mov: ignore duplicate streams referenced with an sbas tref entry

Browse Source 
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer
2026-03-24 13:25:26 -03:00
parent ae6f233988
commit 5dfe661f03
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libavformat/mov.c
View File

@@ -10792,7 +10792,8 @@ static AVStream *mov_find_reference_track(AVFormatContext *s, AVStream *st,
return NULL;
for (int i = first_index; i < s->nb_streams; i++)
if (s->streams[i]->id == sc->tref_id)
if (s->streams[i]->index != st->index &&
s->streams[i]->id == sc->tref_id)
return s->streams[i];
return NULL;
@@ -10834,8 +10835,12 @@ static int mov_parse_lcevc_streams(AVFormatContext *s)
j = st_base->index + 1;
}
if (!j) {
av_log(s, AV_LOG_ERROR, "Failed to find base stream for enhancement stream\n");
return AVERROR_INVALIDDATA;
int loglevel = (s->error_recognition & AV_EF_EXPLODE) ? AV_LOG_ERROR : AV_LOG_WARNING;
av_log(s, loglevel, "Failed to find base stream for LCEVC stream\n");
ff_remove_stream_group(s, stg);
if (s->error_recognition & AV_EF_EXPLODE)
return AVERROR_INVALIDDATA;
continue;
}
err = avformat_stream_group_add_stream(stg, st);