[MPlayer-cvslog] CVS: main cfg-mencoder.h, 1.101, 1.102 mencoder.c, 1.292, 1.293

[Oded Shimon CVS]

CVS change done by Oded Shimon CVS

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

Modified Files:
	cfg-mencoder.h mencoder.c 
Log Message:
-delay for MEncoder, step 1.

Index: cfg-mencoder.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mencoder.h,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- cfg-mencoder.h	2 Jul 2005 19:00:12 -0000	1.101
+++ cfg-mencoder.h	17 Jul 2005 19:25:33 -0000	1.102
@@ -220,7 +220,7 @@
 
 	{"audio-density", &audio_density, CONF_TYPE_INT, CONF_RANGE|CONF_GLOBAL, 1, 50, NULL},
 	{"audio-preload", &audio_preload, CONF_TYPE_FLOAT, CONF_RANGE|CONF_GLOBAL, 0, 2, NULL},
-	{"audio-delay",   &audio_delay, CONF_TYPE_FLOAT, CONF_MIN|CONF_GLOBAL, 0, 0, NULL},
+	{"audio-delay",   &audio_delay_fix, CONF_TYPE_FLOAT, CONF_MIN|CONF_GLOBAL, 0, 0, NULL},
 
 	{"x", "-x is obsolete, use -vf scale=w:h for scaling.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
 	{"xsize", "-xsize is obsolete, use -vf crop=w:h:x:y for cropping.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},

Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.292
retrieving revision 1.293
diff -u -r1.292 -r1.293
--- mencoder.c	3 Jul 2005 10:09:09 -0000	1.292
+++ mencoder.c	17 Jul 2005 19:25:33 -0000	1.293
@@ -146,7 +146,7 @@
 static float c_total=0;
 
 static float audio_preload=0.5;
-static float audio_delay=0.0;
+static float audio_delay_fix=0.0;
 static int audio_density=2;
 
 float force_fps=0;
@@ -898,8 +898,8 @@
 
 if (verbose>1) print_wave_header(mux_a->wf);
 
-if(audio_delay!=0.0){
-    mux_a->h.dwStart=audio_delay*mux_a->h.dwRate/mux_a->h.dwScale;
+if(audio_delay_fix!=0.0){
+    mux_a->h.dwStart=audio_delay_fix*mux_a->h.dwRate/mux_a->h.dwScale;
     mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_SettingAudioDelay,mux_a->h.dwStart*mux_a->h.dwScale/(float)mux_a->h.dwRate);
 }
 if(muxer->fix_stream_parameters)