From: Luca Barbato <lu_zero@gentoo.org>
Date: Thu, 12 Jul 2012 11:38:50 +0000 (+0200)
Subject: matroska: honor error_recognition on unknown doctypes
X-Git-Tag: android-x86-4.4-r1~8529^2~537
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=cd4739c4f2d7ed56405f40dffe6254f6275e6e41;p=android-x86%2Fexternal-ffmpeg.git

matroska: honor error_recognition on unknown doctypes
---

diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 7792b4c52a..95130fc4df 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -1346,6 +1346,10 @@ static int matroska_read_header(AVFormatContext *s)
             break;
     if (i >= FF_ARRAY_ELEMS(matroska_doctypes)) {
         av_log(s, AV_LOG_WARNING, "Unknown EBML doctype '%s'\n", ebml.doctype);
+        if (matroska->ctx->error_recognition & AV_EF_EXPLODE) {
+            ebml_free(ebml_syntax, &ebml);
+            return AVERROR_INVALIDDATA;
+        }
     }
     ebml_free(ebml_syntax, &ebml);