From 591fadadfd9b37442482f22d0d7641fc5d4989d5 Mon Sep 17 00:00:00 2001
From: ods15 <ods15@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Mon, 19 Sep 2005 19:23:38 +0000
Subject: Make frameno.avi not turn on by default. this is deprecated and this
 entire 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
---
 mencoder.c | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

(limited to 'mencoder.c')

diff --git a/mencoder.c b/mencoder.c
index d553108ae2..b0c6b623ea 100644
--- a/mencoder.c
+++ b/mencoder.c
@@ -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;
-- 
cgit v1.2.3