diff options
Diffstat (limited to 'src/demuxers')
| -rw-r--r-- | src/demuxers/demux_matroska.c | 3 | ||||
| -rw-r--r-- | src/demuxers/demux_qt.c | 5 |
2 files changed, 2 insertions, 6 deletions
diff --git a/src/demuxers/demux_matroska.c b/src/demuxers/demux_matroska.c index fe6703dbf..e0e8c9e78 100644 --- a/src/demuxers/demux_matroska.c +++ b/src/demuxers/demux_matroska.c @@ -2887,7 +2887,8 @@ static void *init_class (xine_t *xine, void *data) { this->demux_class.open_plugin = open_plugin; this->demux_class.description = N_("matroska demux plugin"); this->demux_class.identifier = "matroska"; - this->demux_class.mimetypes = "video/mkv: mkv: matroska;"; + this->demux_class.mimetypes = "video/mkv: mkv: matroska;" + "video/x-matroska: mkv: matroska;"; this->demux_class.extensions = "mkv"; this->demux_class.dispose = default_demux_class_dispose; diff --git a/src/demuxers/demux_qt.c b/src/demuxers/demux_qt.c index 9207a97e0..b8e0acb12 100644 --- a/src/demuxers/demux_qt.c +++ b/src/demuxers/demux_qt.c @@ -939,11 +939,6 @@ static qt_error parse_trak_atom (qt_trak *trak, const uint32_t current_atom_size = _X_BE_32(&trak_atom[i - 4]); const qt_atom current_atom = _X_BE_32(&trak_atom[i]); - if (current_atom_size > trak_atom_size - i) { - last_error = QT_NOT_A_VALID_FILE; - goto free_trak; - } - switch(current_atom) { case TKHD_ATOM: trak->flags = _X_BE_16(&trak_atom[i + 6]); |