From 5787833ca99a5ebe2d6e2ff06eac46edbdc33f56 Mon Sep 17 00:00:00 2001
From: albeu <albeu@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sun, 30 Mar 2003 17:07:31 +0000
Subject: Stream cleanup, don't use blah_on options anymore.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9747 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 mencoder.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'mencoder.c')

diff --git a/mencoder.c b/mencoder.c
index 7a24fa0094..60de98c1f3 100644
--- a/mencoder.c
+++ b/mencoder.c
@@ -92,7 +92,6 @@ extern int cache_fill_status;
 #define cache_fill_status 0
 #endif
 
-int vcd_track=0;
 int audio_id=-1;
 int video_id=-1;
 int dvdsub_id=-1;
@@ -422,7 +421,7 @@ if(!parse_codec_cfg(get_path("codecs.conf"))){
   }
 #endif
 
-  if(!filename && !vcd_track && !dvd_title && !tv_param_on && !dvbin_param_on){
+  if(!filename){
 	printf(MSGTR_MissingFilename);
 	mencoder_exit(1,NULL);
   }
@@ -448,7 +447,7 @@ if(!parse_codec_cfg(get_path("codecs.conf"))){
 
   vo_init_osd();
 
-  stream=open_stream(filename,vcd_track,&file_format);
+  stream=open_stream(filename,0,&file_format);
 
   if(!stream){
 	printf(MSGTR_CannotOpenFile_Device);
@@ -899,7 +898,7 @@ if (out_file_format == MUXER_TYPE_MPEG)
 	}
 	}
 
-if(tv_param_on == 1) 
+if(file_format == DEMUXER_TYPE_TV) 
 	{
 	fprintf(stderr,"Forcing audio preload to 0, max pts correction to 0\n");
 	audio_preload = 0.0;
@@ -1114,7 +1113,7 @@ videorate+=(GetTimerMS() - ptimer_start);
 
 if(skip_flag<0){
     // duplicate frame
-	if(!tv_param_on && !verbose) printf(MSGTR_DuplicateFrames,-skip_flag);
+	if(file_format != DEMUXER_TYPE_TV && !verbose) printf(MSGTR_DuplicateFrames,-skip_flag);
     while(skip_flag<0){
 	duplicatedframes++;
 	muxer_write_chunk(mux_v,0,0);
@@ -1123,7 +1122,7 @@ if(skip_flag<0){
 } else
 if(skip_flag>0){
     // skip frame
-	if(!tv_param_on && !verbose) printf(MSGTR_SkipFrame);
+	if(file_format != DEMUXER_TYPE_TV && !verbose) printf(MSGTR_SkipFrame);
 	skippedframes++;
     --skip_flag;
 }
-- 
cgit v1.2.3