[MPlayer-cvslog] CVS: main ChangeLog, 1.249, 1.250 cfg-mencoder.h, 1.102, 1.103 mencoder.c, 1.305, 1.306

[Oded Shimon CVS]

CVS change done by Oded Shimon CVS

Update of /cvsroot/mplayer/main
In directory mail:/var2/tmp/cvs-serv12881

Modified Files:
	ChangeLog cfg-mencoder.h mencoder.c 
Log Message:
Make frameno.avi not turn on by default. this is deprecated and this entire 
feature should be removed anyway. manpage update in a bit...



Index: ChangeLog
===================================================================
RCS file: /cvsroot/mplayer/main/ChangeLog,v
retrieving revision 1.249
retrieving revision 1.250
diff -u -r1.249 -r1.250
--- ChangeLog	15 Sep 2005 11:46:50 -0000	1.249
+++ ChangeLog	19 Sep 2005 19:23:38 -0000	1.250
@@ -110,6 +110,8 @@
     * 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

Index: cfg-mencoder.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mencoder.h,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- cfg-mencoder.h	17 Jul 2005 19:25:33 -0000	1.102
+++ cfg-mencoder.h	19 Sep 2005 19:23:38 -0000	1.103
@@ -203,6 +203,8 @@
 
 	{"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},

Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.305
retrieving revision 1.306
diff -u -r1.305 -r1.306
--- mencoder.c	5 Aug 2005 19:57:44 -0000	1.305
+++ mencoder.c	19 Sep 2005 19:23:38 -0000	1.306
@@ -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;