diff options
| author | Martin Herkt <lachs0r@srsfckn.biz> | 2016-10-19 19:09:00 +0200 |
|---|---|---|
| committer | Martin Herkt <lachs0r@srsfckn.biz> | 2016-10-19 19:09:00 +0200 |
| commit | 5d74fa7dc0fa1617d1d11b69769423b1387ec785 (patch) | |
| tree | 882752015b3500c91b8ab3a4d669696f23feb817 /stream/stream_cb.c | |
| parent | c226bc7616ab2ae9de6172660e9cf727f07dc374 (diff) | |
| parent | a2fa0d0b68ce200598122145254f56ae1adff91e (diff) | |
| download | mpv-5d74fa7dc0fa1617d1d11b69769423b1387ec785.tar.bz2 mpv-5d74fa7dc0fa1617d1d11b69769423b1387ec785.tar.xz | |
Merge branch 'master' into release/current
Diffstat (limited to 'stream/stream_cb.c')
| -rw-r--r-- | stream/stream_cb.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/stream/stream_cb.c b/stream/stream_cb.c index 4496e63255..fa8871ddf6 100644 --- a/stream/stream_cb.c +++ b/stream/stream_cb.c @@ -31,7 +31,7 @@ static int fill_buffer(stream_t *s, char *buffer, int max_len) static int seek(stream_t *s, int64_t newpos) { struct priv *p = s->priv; - return (int)p->info.seek_fn(p->info.cookie, newpos) >= 0; + return p->info.seek_fn(p->info.cookie, newpos) >= 0; } static int control(stream_t *s, int cmd, void *arg) @@ -104,5 +104,4 @@ static int open_cb(stream_t *stream) const stream_info_t stream_info_cb = { .name = "stream_callback", .open = open_cb, - .protocols = (const char*const[]){ "*", NULL }, }; |