ffmpeg | branch: master | wm4 <nfx...@googlemail.com> | Mon Feb 9 20:38:58 2015 +0100| [6938a095cb02dddb295f8340fd12f3c13139b5c8] | committer: Michael Niedermayer
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 <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6938a095cb02dddb295f8340fd12f3c13139b5c8 --- libavformat/matroskadec.c | 4 +--- 1 file changed, 1 insertion(+), 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); } _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
