summaryrefslogtreecommitdiffstats
path: root/demux/demux_mkv.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-02-17 23:55:45 +0100
committerwm4 <wm4@nowhere>2015-02-17 23:58:18 +0100
commitfa9b587426d7bd350d92afdb440c396336b2ecfd (patch)
tree23f8e85f54e6f50a0624b649e221dde19be3af34 /demux/demux_mkv.c
parent082371a1603eaaa6c5c9f4bd57f9e77ff027ee15 (diff)
downloadmpv-fa9b587426d7bd350d92afdb440c396336b2ecfd.tar.bz2
mpv-fa9b587426d7bd350d92afdb440c396336b2ecfd.tar.xz
demux, matroska: remove demuxer type field
The Matroska timeline code was the only thing which still used the demuxer.type field. This field explicitly identifies a demuxer implementation. The purpose of the Matroska timeline code was to reject files that are not Matroska. But it already forces the Matroska format, meaning loading will explicitly only use the Matroska demuxer. If the demuxer can't open the file, no other demuxer will be tried, and thus checking the field is redundant. The change in demux_mkv_timeline.c removes the if condition, and unindents the if body.
Diffstat (limited to 'demux/demux_mkv.c')
-rw-r--r--demux/demux_mkv.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/demux/demux_mkv.c b/demux/demux_mkv.c
index b1a299feca..2c1f34d70c 100644
--- a/demux/demux_mkv.c
+++ b/demux/demux_mkv.c
@@ -2884,7 +2884,6 @@ static void mkv_free(struct demuxer *demuxer)
const demuxer_desc_t demuxer_desc_matroska = {
.name = "mkv",
.desc = "Matroska",
- .type = DEMUXER_TYPE_MATROSKA,
.open = demux_mkv_open,
.fill_buffer = demux_mkv_fill_buffer,
.close = mkv_free,