Mercurial > mplayer.hg

changeset 3091:a98d486508db

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixed tv detection in demux_open
author alex
date Fri, 23 Nov 2001 18:51:32 +0000
parents 57abb24ac58b
children c442c6565922
files libmpdemux/demuxer.c
diffstat 1 files changed, 4 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/libmpdemux/demuxer.c	Fri Nov 23 18:25:32 2001 +0000
+++ b/libmpdemux/demuxer.c	Fri Nov 23 18:51:32 2001 +0000
@@ -374,13 +374,11 @@
 
 #ifdef USE_TV
 //=============== Try to open as TV-input: =================
-if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_TV){
+if((tv_param_on == 1) &&
+    (file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_TV)){
   demuxer=new_demuxer(stream,DEMUXER_TYPE_TV,audio_id,video_id,dvdsub_id);
-  if(tv_param_on==1)
-  {
-    mp_msg(MSGT_DEMUXER,MSGL_INFO,"Detected TV! ;-)\n");
-    file_format=DEMUXER_TYPE_TV;
-  }
+  mp_msg(MSGT_DEMUXER,MSGL_INFO,"Detected TV! ;-)\n");
+  file_format=DEMUXER_TYPE_TV;
 }
 #endif
 //=============== Try to open as AVI file: =================