diff options
| author | wm4 <nfxjfg@googlemail.com> | 2015-02-09 20:38:58 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-09 21:33:33 +0100 |
| commit | 6938a095cb02dddb295f8340fd12f3c13139b5c8 (patch) | |
| tree | 97b9e0fcd57f4d5c567bac096778a861ad07bd93 /libavformat/matroskadec.c | |
| parent | e8f814a907036e43f755f35e885bfadf94c4d63b (diff) | |
| download | ffmpeg-streaming-6938a095cb02dddb295f8340fd12f3c13139b5c8.zip ffmpeg-streaming-6938a095cb02dddb295f8340fd12f3c13139b5c8.tar.gz | |
matroska: don't complain about unknown elements
Matroska is an extensible format - unknown elements must be expected. It
shouldn't complain about such elements to the user either; it'll just
generate noise. The "error_recognition & AV_EF_EXPLODE" is completely,
wrong why would it explode on valid files?
It's still useful for debugging, so the message is left in place with a
higher log level.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/matroskadec.c')
| -rw-r--r-- | libavformat/matroskadec.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 4140342..f87d7d8 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -927,9 +927,7 @@ static int ebml_parse_id(MatroskaDemuxContext *matroska, EbmlSyntax *syntax, 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) { - av_log(matroska->ctx, AV_LOG_INFO, "Unknown entry 0x%"PRIX32"\n", id); - if (matroska->ctx->error_recognition & AV_EF_EXPLODE) - return AVERROR_INVALIDDATA; + av_log(matroska->ctx, AV_LOG_DEBUG, "Unknown entry 0x%"PRIX32"\n", id); } return ebml_parse_elem(matroska, &syntax[i], data); } |
