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 /stream/stream_dvdnav.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 'stream/stream_dvdnav.c')
| -rw-r--r-- | stream/stream_dvdnav.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/stream/stream_dvdnav.c b/stream/stream_dvdnav.c index 1178f50857..21827b6898 100644 --- a/stream/stream_dvdnav.c +++ b/stream/stream_dvdnav.c @@ -507,7 +507,6 @@ static int open_s_internal(stream_t *stream) stream->fill_buffer = fill_buffer; stream->control = control; stream->close = stream_dvdnav_close; - stream->type = STREAMTYPE_DVD; stream->demuxer = "+disc"; stream->lavf_type = "mpeg"; stream->allow_caching = false; @@ -596,7 +595,7 @@ unsupported: } const stream_info_t stream_info_ifo_dvdnav = { - .name = "ifo/dvdnav", + .name = "ifo_dvdnav", .open = ifo_dvdnav_stream_open, .protocols = (const char*const[]){ "file", "", NULL }, }; |