Mercurial > mplayer.hg

changeset 23677:ede2719f604f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Don't override input= option value is no input id is passed in tv:// url. Remove debug fprintf
author voroshil
date Sat, 30 Jun 2007 10:56:05 +0000
parents f3cb35ec74c3
children 59d684441bd6
files stream/stream_tv.c
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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;
 }