Mercurial > mplayer.hg
comparison 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 |
comparison
equal
deleted
inserted
replaced
16527:ab575679aa48 | 16528:c1267de1d7d9 |
---|---|
232 return m_config_parse_config_file(mconfig, filename); | 232 return m_config_parse_config_file(mconfig, filename); |
233 } | 233 } |
234 | 234 |
235 static char *seek_to_sec=NULL; | 235 static char *seek_to_sec=NULL; |
236 static off_t seek_to_byte=0; | 236 static off_t seek_to_byte=0; |
237 | |
238 static char * frameno_filename=NULL; | |
237 | 239 |
238 static void parse_end_at(); | 240 static void parse_end_at(); |
239 static char * end_at_string=0; | 241 static char * end_at_string=0; |
240 //static uint8_t* flip_upside_down(uint8_t* dst, const uint8_t* src, int width, int height); | 242 //static uint8_t* flip_upside_down(uint8_t* dst, const uint8_t* src, int width, int height); |
241 | 243 |
385 double v_pts_corr=0; | 387 double v_pts_corr=0; |
386 double v_timer_corr=0; | 388 double v_timer_corr=0; |
387 | 389 |
388 m_entry_t* filelist = NULL; | 390 m_entry_t* filelist = NULL; |
389 char* filename=NULL; | 391 char* filename=NULL; |
390 char* frameno_filename="frameno.avi"; | |
391 | 392 |
392 int decoded_frameno=0; | 393 int decoded_frameno=0; |
393 int next_frameno=-1; | 394 int next_frameno=-1; |
394 int curfile=0; | 395 int curfile=0; |
395 int new_srate; | 396 int new_srate; |
450 mp_msg(MSGT_MENCODER,MSGL_V,MSGTR_BuiltinCodecsConf); | 451 mp_msg(MSGT_MENCODER,MSGL_V,MSGTR_BuiltinCodecsConf); |
451 } | 452 } |
452 } | 453 } |
453 } | 454 } |
454 | 455 |
455 // FIXME: get rid of -dvd and other tricky options | 456 mconfig = m_config_new(); |
457 m_config_register_options(mconfig,mencoder_opts); | |
458 parse_cfgfiles(mconfig); | |
459 filelist = m_config_parse_me_command_line(mconfig, argc, argv); | |
460 if(!filelist) mencoder_exit(1, MSGTR_ErrorParsingCommandLine); | |
461 | |
462 mp_msg_set_level(verbose+MSGL_STATUS); | |
463 | |
464 if (frameno_filename) { | |
456 stream2=open_stream(frameno_filename,0,&i); | 465 stream2=open_stream(frameno_filename,0,&i); |
457 if(stream2){ | 466 if(stream2){ |
458 demuxer2=demux_open(stream2,DEMUXER_TYPE_AVI,-1,-1,-2,NULL); | 467 demuxer2=demux_open(stream2,DEMUXER_TYPE_AVI,-1,-1,-2,NULL); |
459 if(demuxer2) mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_UsingPass3ControllFile, frameno_filename); | 468 if(demuxer2) mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_UsingPass3ControllFile, frameno_filename); |
460 else mp_msg(MSGT_DEMUXER,MSGL_ERR,MSGTR_FormatNotRecognized); | 469 else mp_msg(MSGT_DEMUXER,MSGL_ERR,MSGTR_FormatNotRecognized); |
461 } | 470 } |
462 | 471 } |
463 mconfig = m_config_new(); | |
464 m_config_register_options(mconfig,mencoder_opts); | |
465 parse_cfgfiles(mconfig); | |
466 filelist = m_config_parse_me_command_line(mconfig, argc, argv); | |
467 if(!filelist) mencoder_exit(1, MSGTR_ErrorParsingCommandLine); | |
468 | |
469 mp_msg_set_level(verbose+MSGL_STATUS); | |
470 | 472 |
471 #ifdef WIN32 | 473 #ifdef WIN32 |
472 if(proc_priority){ | 474 if(proc_priority){ |
473 int i; | 475 int i; |
474 for(i=0; priority_presets_defs[i].name; i++){ | 476 for(i=0; priority_presets_defs[i].name; i++){ |