diff mencoder.c @ 15565:1c1c7cd29707

restored preinit_audio_filters() but set the final sample_rate to the value of -srate, if specified: the source sample_rate is sped up or down while the destination can be resampled at will; 1 aboundant liter to me

--- a/mencoder.c	Tue May 24 11:35:07 2005 +0000
+++ b/mencoder.c	Tue May 24 19:46:44 2005 +0000
@@ -810,7 +810,6 @@
 
 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,11 +824,7 @@
    }
 
 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.sample_rate = force_srate ? force_srate : ao_data.samplerate;
 aparams.audio_preload = 1000 * audio_preload;
 if(mux_a->codec != ACODEC_COPY) {
     aencoder = new_audio_encoder(mux_a, &aparams);