Mercurial > mplayer.hg
changeset 15992:11966749d065
-delay for MEncoder, step 1.
| author | ods15 |
|---|---|
| date | Sun, 17 Jul 2005 19:25:33 +0000 |
| parents | 3042ee91c7dd |
| children | 4cc096594a6a |
| files | cfg-mencoder.h mencoder.c |
| diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/cfg-mencoder.h Sun Jul 17 16:02:49 2005 +0000 +++ b/cfg-mencoder.h Sun Jul 17 19:25:33 2005 +0000 @@ -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},
--- a/mencoder.c Sun Jul 17 16:02:49 2005 +0000 +++ b/mencoder.c Sun Jul 17 19:25:33 2005 +0000 @@ -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)