diff options
| author | nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-04-12 20:36:57 +0000 |
|---|---|---|
| committer | nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-04-12 20:36:57 +0000 |
| commit | cc5373d7ca2464e25da24819d529315f5a0d1ad3 (patch) | |
| tree | cb987b1775ad8bdccaf72757002eeb4ac76dbbfc /stream | |
| parent | e23c244ee71e492dfce28dfdb5b0fe84015c4d59 (diff) | |
| download | mpv-cc5373d7ca2464e25da24819d529315f5a0d1ad3.tar.bz2 mpv-cc5373d7ca2464e25da24819d529315f5a0d1ad3.tar.xz | |
removed useless parameter :type from -dvbin (the frontend type is reported by the card)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26423 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'stream')
| -rw-r--r-- | stream/stream_dvb.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/stream/stream_dvb.c b/stream/stream_dvb.c index 7bee8600d4..b65152f1e8 100644 --- a/stream/stream_dvb.c +++ b/stream/stream_dvb.c @@ -62,13 +62,12 @@ static struct stream_priv_s { char *prog; int card; - char *type; int timeout; char *file; } stream_defaults = { - "", 1, "", 30, NULL + "", 1, 30, NULL }; #define ST_OFF(f) M_ST_OFF(struct stream_priv_s, f) @@ -77,7 +76,6 @@ stream_defaults = static const m_option_t stream_params[] = { {"prog", ST_OFF(prog), CONF_TYPE_STRING, 0, 0 ,0, NULL}, {"card", ST_OFF(card), CONF_TYPE_INT, M_OPT_RANGE, 1, 4, NULL}, - {"type", ST_OFF(type), CONF_TYPE_STRING, 0, 0 ,0, NULL}, {"timeout",ST_OFF(timeout), CONF_TYPE_INT, M_OPT_RANGE, 1, 30, NULL}, {"file", ST_OFF(file), CONF_TYPE_STRING, 0, 0 ,0, NULL}, @@ -98,7 +96,6 @@ static const struct m_struct_st stream_opts = { const m_option_t dvbin_opts_conf[] = { {"prog", &stream_defaults.prog, CONF_TYPE_STRING, 0, 0 ,0, NULL}, {"card", &stream_defaults.card, CONF_TYPE_INT, M_OPT_RANGE, 1, 4, NULL}, - {"type", "DVB card type is autodetected and can't be overridden\n", CONF_TYPE_PRINT, CONF_NOCFG, 0 ,0, NULL}, {"timeout", &stream_defaults.timeout, CONF_TYPE_INT, M_OPT_RANGE, 1, 30, NULL}, {"file", &stream_defaults.file, CONF_TYPE_STRING, 0, 0 ,0, NULL}, @@ -629,8 +626,8 @@ static int dvb_streaming_start(stream_t *stream, struct stream_priv_s *opts, int dvb_channel_t *channel = NULL; dvb_priv_t *priv = stream->priv; - mp_msg(MSGT_DEMUX, MSGL_V, "\r\ndvb_streaming_start(PROG: %s, CARD: %d, TYPE: %s, FILE: %s)\r\n", - opts->prog, opts->card, opts->type, opts->file); + mp_msg(MSGT_DEMUX, MSGL_V, "\r\ndvb_streaming_start(PROG: %s, CARD: %d, FILE: %s)\r\n", + opts->prog, opts->card, opts->file); priv->is_on = 0; |