[Mplayer-cvslog] CVS: main cfg-mplayer.h,1.95,1.96 mplayer.c,1.305,1.306

[Arpi of Ize]

Update of /cvsroot/mplayer/main
In directory mplayer:/var/tmp.root/cvs-serv29098

Modified Files:
	cfg-mplayer.h mplayer.c 
Log Message:
-encode killed

Index: cfg-mplayer.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mplayer.h,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- cfg-mplayer.h	23 Oct 2001 20:15:00 -0000	1.95
+++ cfg-mplayer.h	29 Oct 2001 00:55:54 -0000	1.96
@@ -131,7 +131,7 @@
 	{"monitor_vfreq", &monitor_vfreq_str, CONF_TYPE_STRING, 0, 0, 0},
 	{"monitor_dotclock", &monitor_dotclock_str, CONF_TYPE_STRING, 0, 0, 0},
 #endif
-	{"encode", &encode_name, CONF_TYPE_STRING, 0, 0, 0},
+//	{"encode", &encode_name, CONF_TYPE_STRING, 0, 0, 0},
 #ifdef USE_SUB
 	{"sub", &sub_name, CONF_TYPE_STRING, 0, 0, 0},
 #ifdef USE_ICONV
@@ -229,7 +229,7 @@
         {"oldpp", "MPlayer was compiled without opendivx library", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0},
 #endif
 	{"autoq", &auto_quality, CONF_TYPE_INT, CONF_RANGE, 0, 100},
-	{"br", &encode_bitrate, CONF_TYPE_INT, CONF_RANGE, 10000, 10000000},
+//	{"br", &encode_bitrate, CONF_TYPE_INT, CONF_RANGE, 10000, 10000000},
 #ifdef HAVE_PNG
 	{"z", &z_compression, CONF_TYPE_INT, CONF_RANGE, 0, 9},
 #endif	

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.305
retrieving revision 1.306
diff -u -r1.305 -r1.306
--- mplayer.c	26 Oct 2001 20:55:45 -0000	1.305
+++ mplayer.c	29 Oct 2001 00:55:54 -0000	1.306
@@ -126,9 +126,9 @@
 
 #include "stheader.h"
 
-char* encode_name=NULL;
-char* encode_index_name=NULL;
-int encode_bitrate=0;
+//char* encode_name=NULL;
+//char* encode_index_name=NULL;
+//int encode_bitrate=0;
 
 int get_video_quality_max(sh_video_t *sh_video);
 void set_video_quality(sh_video_t *sh_video,int quality);
@@ -318,11 +318,11 @@
   }
 #endif
 
-  if(mask&INITED_ENCODE){
-    inited_flags&=~INITED_ENCODE;
-    current_module="uninit_encode";
-    avi_fixate();
-  }
+//  if(mask&INITED_ENCODE){
+//    inited_flags&=~INITED_ENCODE;
+//    current_module="uninit_encode";
+//    avi_fixate();
+//  }
 
   if(mask&INITED_STREAM){
     inited_flags&=~INITED_STREAM;
@@ -985,6 +985,7 @@
 }
 
 // ================== Init output files for encoding ===============
+#if 0
    if(encode_name){
      // encode file!!!
      FILE *encode_file=fopen(encode_name,"rb");
@@ -1009,6 +1010,7 @@
      sh_audio=d_audio->sh=NULL; // force nosound
      inited_flags|=INITED_ENCODE;
    }
+#endif
 
 // ========== Init display (sh_video->disp_w*sh_video->disp_h/out_fmt) ============