Mercurial > mplayer.hg
diff mencoder.c @ 16528:c1267de1d7d9
Make frameno.avi not turn on by default. this is deprecated and this entire
feature should be removed anyway. manpage update in a bit...
author | ods15 |
---|---|
date | Mon, 19 Sep 2005 19:23:38 +0000 |
parents | 6b86089c2edd |
children | 89504641c2a5 |
line wrap: on
line diff
--- a/mencoder.c Mon Sep 19 18:28:30 2005 +0000 +++ b/mencoder.c Mon Sep 19 19:23:38 2005 +0000 @@ -235,6 +235,8 @@ static char *seek_to_sec=NULL; static off_t seek_to_byte=0; +static char * frameno_filename=NULL; + static void parse_end_at(); static char * end_at_string=0; //static uint8_t* flip_upside_down(uint8_t* dst, const uint8_t* src, int width, int height); @@ -387,7 +389,6 @@ m_entry_t* filelist = NULL; char* filename=NULL; -char* frameno_filename="frameno.avi"; int decoded_frameno=0; int next_frameno=-1; @@ -452,14 +453,6 @@ } } - // FIXME: get rid of -dvd and other tricky options - stream2=open_stream(frameno_filename,0,&i); - if(stream2){ - demuxer2=demux_open(stream2,DEMUXER_TYPE_AVI,-1,-1,-2,NULL); - if(demuxer2) mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_UsingPass3ControllFile, frameno_filename); - else mp_msg(MSGT_DEMUXER,MSGL_ERR,MSGTR_FormatNotRecognized); - } - mconfig = m_config_new(); m_config_register_options(mconfig,mencoder_opts); parse_cfgfiles(mconfig); @@ -468,6 +461,15 @@ mp_msg_set_level(verbose+MSGL_STATUS); +if (frameno_filename) { + stream2=open_stream(frameno_filename,0,&i); + if(stream2){ + demuxer2=demux_open(stream2,DEMUXER_TYPE_AVI,-1,-1,-2,NULL); + if(demuxer2) mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_UsingPass3ControllFile, frameno_filename); + else mp_msg(MSGT_DEMUXER,MSGL_ERR,MSGTR_FormatNotRecognized); + } +} + #ifdef WIN32 if(proc_priority){ int i;