diff options
| author | Martin Herkt <lachs0r@srsfckn.biz> | 2017-02-12 01:01:56 +0100 |
|---|---|---|
| committer | Martin Herkt <lachs0r@srsfckn.biz> | 2017-02-12 01:01:56 +0100 |
| commit | 35aa705c3ece8293652ffcf449c71fe80b96e722 (patch) | |
| tree | 7c0fb34ec96204cbcd867a973b2476689919a5b4 /demux/demux_mf.c | |
| parent | 10a005df0c981050afc35184a42173bea7ea2527 (diff) | |
| parent | 3739d1318fdb658bb6037bfe06bb6cefb3b50a09 (diff) | |
| download | mpv-35aa705c3ece8293652ffcf449c71fe80b96e722.tar.bz2 mpv-35aa705c3ece8293652ffcf449c71fe80b96e722.tar.xz | |
Merge branch 'master' into release/current
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); |