summaryrefslogtreecommitdiffstats
path: root/stream/stream_tv.c
diff options
context:
space:
mode:
Diffstat (limited to 'stream/stream_tv.c')
-rw-r--r--stream/stream_tv.c6
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;
}