diff options
author | voroshil <voroshil@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-06-30 10:56:05 +0000 |
---|---|---|
committer | voroshil <voroshil@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-06-30 10:56:05 +0000 |
commit | f0ca43a600acc44e2a79d3812d93f3db2698e273 (patch) | |
tree | 88630dacbe2aac3a26c6481d6fac895ed7ef1fc5 | |
parent | 88166aa171f9282950ffd78077c4efbadaa0929f (diff) |
Don't override input= option value is no input id is passed in tv:// url.
Remove debug fprintf
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23697 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r-- | stream/stream_tv.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/stream/stream_tv.c b/stream/stream_tv.c index 2bcde2b80d..6ad7abb63d 100644 --- a/stream/stream_tv.c +++ b/stream/stream_tv.c @@ -34,7 +34,7 @@ static struct stream_priv_s { int input; char* channel; } stream_priv_dflts = { - 0, + -1, NULL }; @@ -62,10 +62,12 @@ tv_stream_open (stream_t *stream, int mode, void *opts, int *file_format) stream->type = STREAMTYPE_TV; *file_format = DEMUXER_TYPE_TV; + /* don't override input= option value if no input id is + passed in tv:// url */ + if(p->input!=-1) tv_param_input=p->input; if (p->channel) tv_param_channel=strdup (p->channel); -fprintf(stderr,"%p\n",p->channel) ; return STREAM_OK; } |