diff options
| -rw-r--r-- | cfg-mencoder.h | 2 | ||||
| -rw-r--r-- | mencoder.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/cfg-mencoder.h b/cfg-mencoder.h index c8779461b0..38f08bfd91 100644 --- a/cfg-mencoder.h +++ b/cfg-mencoder.h @@ -220,7 +220,7 @@ m_option_t mencoder_opts[]={ {"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}, diff --git a/mencoder.c b/mencoder.c index 8e1a454252..c03bfaead1 100644 --- a/mencoder.c +++ b/mencoder.c @@ -146,7 +146,7 @@ static float max_pts_correction=0;//default_max_pts_correction; 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 @@ case ACODEC_COPY: 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) |