# HG changeset patch # User rfelker # Date 1116923385 0 # Node ID 6e2c6d2553bd55b572bb2999d377d09768a3f5d4 # Parent 3d1f21672c3e82393f1575270fb7cb4aa169ed3e disable preinit until it's fixed (it breaks -speed...codec is initialized with wrong samplerate) diff -r 3d1f21672c3e -r 6e2c6d2553bd mencoder.c --- a/mencoder.c Tue May 24 06:58:55 2005 +0000 +++ b/mencoder.c Tue May 24 08:29:45 2005 +0000 @@ -810,6 +810,7 @@ mux_a->codec=out_audio_codec; +#if 0 ao_data.samplerate = force_srate ? force_srate : new_srate; ao_data.channels = audio_output_channels ? audio_output_channels : sh_audio->channels; ao_data.format = audio_output_format ? audio_output_format : sh_audio->sample_format; @@ -825,6 +826,10 @@ aparams.channels = ao_data.channels; aparams.sample_rate = ao_data.samplerate; +#else +aparams.channels = audio_output_channels ? audio_output_channels : sh_audio->channels; +aparams.sample_rate = force_srate ? force_srate : new_srate; +#endif aparams.audio_preload = 1000 * audio_preload; if(mux_a->codec != ACODEC_COPY) { aencoder = new_audio_encoder(mux_a, &aparams);