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_file.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_file.c')
-rw-r--r-- | stream/stream_file.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/stream/stream_file.c b/stream/stream_file.c index 5d5925ac7c..bfe40429cb 100644 --- a/stream/stream_file.c +++ b/stream/stream_file.c @@ -234,7 +234,7 @@ static int open_f(stream_t *stream) .fd = -1 }; stream->priv = p; - stream->type = STREAMTYPE_FILE; + stream->is_local_file = true; bool write = stream->mode == STREAM_WRITE; int m = O_CLOEXEC | (write ? O_RDWR | O_CREAT | O_TRUNC : O_RDONLY); @@ -281,7 +281,7 @@ static int open_f(stream_t *stream) if (fstat(p->fd, &st) == 0) { if (S_ISDIR(st.st_mode)) { p->use_poll = false; - stream->type = STREAMTYPE_DIR; + stream->is_directory = true; stream->allow_caching = false; MP_INFO(stream, "This is a directory - adding to playlist.\n"); } |