# HG changeset patch # User voroshil # Date 1183200965 0 # Node ID ede2719f604f099b08c6440b22d822f112bcdc17 # Parent f3cb35ec74c3a53aaf37cee32f5a391ee3c00e74 Don't override input= option value is no input id is passed in tv:// url. Remove debug fprintf diff -r f3cb35ec74c3 -r ede2719f604f stream/stream_tv.c --- a/stream/stream_tv.c Fri Jun 29 21:57:31 2007 +0000 +++ b/stream/stream_tv.c Sat Jun 30 10:56:05 2007 +0000 @@ -34,7 +34,7 @@ int input; char* channel; } stream_priv_dflts = { - 0, + -1, NULL }; @@ -62,10 +62,12 @@ 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; }