You've already forked FFmpeg
mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-07-11 14:30:22 +02:00
avformat/matroskadec: Allow multiple Tags elements
The Matroska specification allows multiple (level 1) Tags elements per file, yet our demuxer didn't: While it parsed any amount of Tags elements it found in front of the Clusters (albeit with warnings because of duplicate elements), it would treat any Tags element only referenced via a SeekHead entry as already parsed if any Tags element has already been parsed; therefore this Tags element would not be parsed at all. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
@ -1147,11 +1147,11 @@ static MatroskaLevel1Element *matroska_find_level1_elem(MatroskaDemuxContext *ma
|
||||
if (id == MATROSKA_ID_CLUSTER)
|
||||
return NULL;
|
||||
|
||||
// There can be multiple seekheads.
|
||||
// There can be multiple SeekHeads and Tags.
|
||||
for (i = 0; i < matroska->num_level1_elems; i++) {
|
||||
if (matroska->level1_elems[i].id == id) {
|
||||
if (matroska->level1_elems[i].pos == pos ||
|
||||
id != MATROSKA_ID_SEEKHEAD)
|
||||
id != MATROSKA_ID_SEEKHEAD && id != MATROSKA_ID_TAGS)
|
||||
return &matroska->level1_elems[i];
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user