[MPlayer-cvslog] r23697 - trunk/stream/stream_tv.c

[voroshil]

Author: voroshil
Date: Sat Jun 30 12:56:05 2007
New Revision: 23697

Log:
Don't override input= option value is no input id is passed in tv:// url.
Remove debug fprintf



Modified:
   trunk/stream/stream_tv.c

Modified: trunk/stream/stream_tv.c
==============================================================================
--- trunk/stream/stream_tv.c	(original)
+++ trunk/stream/stream_tv.c	Sat Jun 30 12:56:05 2007
@@ -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 mo
   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;
 }