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_tv.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_tv.c')
-rw-r--r-- | stream/stream_tv.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/stream/stream_tv.c b/stream/stream_tv.c index 9c8861dcea..435e3e7b54 100644 --- a/stream/stream_tv.c +++ b/stream/stream_tv.c @@ -31,13 +31,6 @@ #include <stdio.h> -#define OPT_BASE_STRUCT struct tv_stream_params -static const m_option_t stream_opts_fields[] = { - OPT_STRING("channel", channel, 0), - OPT_INT("input", input, 0), - {0} -}; - static void tv_stream_close (stream_t *stream) { @@ -58,14 +51,4 @@ const stream_info_t stream_info_tv = { .name = "tv", .open = tv_stream_open, .protocols = (const char*const[]){ "tv", NULL }, - .priv_size = sizeof(tv_param_t), - .priv_defaults = &(const struct tv_stream_params){ - .input = -1, - }, - .options = stream_opts_fields, - .url_options = (const char*const[]){ - "hostname=channel", - "filename=input", - NULL - }, }; |