Browse Source

matroskadec: honor error_recognition when encountering unknown elements.

tags/n1.0
Anton Khirnov 13 years ago
parent
commit
5b7a88f0ba
1 changed files with 4 additions and 1 deletions
  1. +4
    -1
      libavformat/matroskadec.c

+ 4
- 1
libavformat/matroskadec.c View File

@@ -783,8 +783,11 @@ static int ebml_parse_id(MatroskaDemuxContext *matroska, EbmlSyntax *syntax,
matroska->num_levels > 0 &&
matroska->levels[matroska->num_levels-1].length == 0xffffffffffffff)
return 0; // we reached the end of an unknown size cluster
if (!syntax[i].id && id != EBML_ID_VOID && id != EBML_ID_CRC32)
if (!syntax[i].id && id != EBML_ID_VOID && id != EBML_ID_CRC32) {
av_log(matroska->ctx, AV_LOG_INFO, "Unknown entry 0x%X\n", id);
if (matroska->ctx->error_recognition & AV_EF_EXPLODE)
return AVERROR_INVALIDDATA;
}
return ebml_parse_elem(matroska, &syntax[i], data);
}



Loading…
Cancel
Save