Mercurial > mplayer.hg
diff mencoder.c @ 9746:27fff718ede6
Stream cleanup, don't use blah_on options anymore.
author | albeu |
---|---|
date | Sun, 30 Mar 2003 17:07:31 +0000 |
parents | b9f43efd98e7 |
children | 6586ec1f6ee4 |
line wrap: on
line diff
--- a/mencoder.c Sun Mar 30 17:05:58 2003 +0000 +++ b/mencoder.c Sun Mar 30 17:07:31 2003 +0000 @@ -92,7 +92,6 @@ #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 @@ } #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 @@ 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(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 @@ 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 @@ } 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; }