aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-04-19 16:45:24 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-04-19 16:47:12 +0200
commit0cab0931dcf23e3ac111649b16a5efadf7285ac6 (patch)
tree2c4f033dfbf6d0099215f2f225d1e77c1e5ba6e1 /libavformat
parent9a0f60a0f89a7a71839dfa9def5a26f2037aed62 (diff)
downloadffmpeg-0cab0931dcf23e3ac111649b16a5efadf7285ac6.tar.gz
avformat/matroskadec: remove now duplicate doctype check
See: b8d7f3186e86234f6255f5e8ee9e98573b4d9a6e See: d9fe6b926cd619c311e45e0ae352cf09713c482c Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/matroskadec.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index f53352e990..98efc7c034 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",