diff options
| author | wm4 <wm4@nowhere> | 2015-02-17 23:55:45 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2015-02-17 23:58:18 +0100 |
| commit | fa9b587426d7bd350d92afdb440c396336b2ecfd (patch) | |
| tree | 23f8e85f54e6f50a0624b649e221dde19be3af34 /demux/demux.c | |
| parent | 082371a1603eaaa6c5c9f4bd57f9e77ff027ee15 (diff) | |
| download | mpv-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.c')
| -rw-r--r-- | demux/demux.c | 1 |
1 files changed, 0 insertions, 1 deletions
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, |