diff options
author | wm4 <wm4@nowhere> | 2017-02-02 18:24:27 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2017-02-02 18:26:58 +0100 |
commit | fb9a32977d6abf4c83a92d993af58e393819c062 (patch) | |
tree | daa8fac391c393560588ce8653943a8259f59815 /demux/demux_mf.c | |
parent | e13a62fc346867450cd41d02cffbdaf477a3fec4 (diff) | |
download | mpv-fb9a32977d6abf4c83a92d993af58e393819c062.tar.bz2 mpv-fb9a32977d6abf4c83a92d993af58e393819c062.tar.xz |
stream: get rid of streamtype enum
Because it's kind of dumb. (But not sure if it was worth the trouble.)
For stream_file.c, we add new explicit fields. The rest are rather
special uses and can be killed by comparing the stream impl. name.
The changes to DVD/BD/CD/TV are entirely untested.
Diffstat (limited to 'demux/demux_mf.c')
-rw-r--r-- | demux/demux_mf.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/demux/demux_mf.c b/demux/demux_mf.c index 4abd394317..50afd355b7 100644 --- a/demux/demux_mf.c +++ b/demux/demux_mf.c @@ -294,9 +294,10 @@ static int demux_open_mf(demuxer_t *demuxer, enum demux_check check) mf_t *mf; if (strncmp(demuxer->stream->url, "mf://", 5) == 0 && - demuxer->stream->type == STREAMTYPE_MF) + demuxer->stream->info && strcmp(demuxer->stream->info->name, "mf") == 0) + { mf = open_mf_pattern(demuxer, demuxer->log, demuxer->stream->url + 5); - else { + } else { mf = open_mf_single(demuxer, demuxer->log, demuxer->stream->url); int bog = 0; MP_TARRAY_APPEND(mf, mf->streams, bog, demuxer->stream); |