mirror/mpv
0
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2024-09-20 12:02:23 +02:00
Code

Make frameno.avi not turn on by default. this is deprecated and this entire

Browse Source 
feature should be removed anyway. manpage update in a bit...


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16529 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
ods15 2005-09-19 19:23:38 +00:00
parent dd9a635a6c
commit 591fadadfd
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -110,6 +110,8 @@ MPlayer (1.0)
* lots of new slave commands (check DOCS/tech/slave.txt)
* lots of new information provided by the -identify option
* fixed ugly looking OSD with -vo gl2 and MMX
* search for (deprecated!) frameno.avi is now disabled by default (use
-frameno-file frameno.avi to enable)
pre7try2: August 26, 2005

2
cfg-mencoder.h
View File

@ -203,6 +203,8 @@ m_option_t mencoder_opts[]={
{"endpos", &end_at_string, CONF_TYPE_STRING, 0, 0, 0, NULL},
{"frameno-file", &frameno_filename, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL},
#ifdef USE_EDL
{"hr-edl-seek", &edl_seek_type, CONF_TYPE_FLAG, 0, 0, 1, NULL},
{"nohr-edl-seek", &edl_seek_type, CONF_TYPE_FLAG, 0, 1, 0, NULL},

20
mencoder.c
View File

@ -235,6 +235,8 @@ static int cfg_include(m_option_t *conf, char *filename){
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 @@ double v_timer_corr=0;
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 @@ if(!codecs_file || !parse_codec_cfg(codecs_file)){
}
}
// 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 @@ if(!codecs_file || !parse_codec_cfg(codecs_file)){
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;