From fa9b587426d7bd350d92afdb440c396336b2ecfd Mon Sep 17 00:00:00 2001 From: wm4 Date: Tue, 17 Feb 2015 23:55:45 +0100 Subject: 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. --- demux/demux.c | 1 - 1 file changed, 1 deletion(-) (limited to 'demux/demux.c') diff --git a/demux/demux.c b/demux/demux.c index e29956af12..e901a9352b 100644 --- a/demux/demux.c +++ b/demux/demux.c @@ -900,7 +900,6 @@ static struct demuxer *open_given_type(struct mpv_global *global, struct demuxer *demuxer = talloc_ptrtype(NULL, demuxer); *demuxer = (struct demuxer) { .desc = desc, - .type = desc->type, .stream = stream, .seekable = stream->seekable, .filepos = -1, -- cgit v1.2.3