[FFmpeg-cvslog] avformat/matroskadec: remove now duplicate doctype check

Michael Niedermayer git at videolan.org
Sun Apr 19 17:00:53 CEST 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Apr 19 16:45:24 2015 +0200| [0cab0931dcf23e3ac111649b16a5efadf7285ac6] | committer: Michael Niedermayer

avformat/matroskadec: remove now duplicate  doctype check

See: b8d7f3186e86234f6255f5e8ee9e98573b4d9a6e
See: d9fe6b926cd619c311e45e0ae352cf09713c482c
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0cab0931dcf23e3ac111649b16a5efadf7285ac6
---

 libavformat/matroskadec.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index f53352e..98efc7c 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -2088,8 +2088,7 @@ static int matroska_read_header(AVFormatContext *s)
     if (ebml.version         > EBML_VERSION      ||
         ebml.max_size        > sizeof(uint64_t)  ||
         ebml.id_length       > sizeof(uint32_t)  ||
-        ebml.doctype_version > 3                 ||
-        !ebml.doctype) {
+        ebml.doctype_version > 3) {
         av_log(matroska->ctx, AV_LOG_ERROR,
                "EBML header using unsupported features\n"
                "(EBML version %"PRIu64", doctype %s, doc version %"PRIu64")\n",



More information about the ffmpeg-cvslog mailing list