From 22a08bc3465e256fa78f59649b30aa8c1efecdf5 Mon Sep 17 00:00:00 2001 From: nicodvb Date: Tue, 24 May 2005 19:46:44 +0000 Subject: 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 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15566 b3059339-0415-0410-9bf9-f77b7e298cf2 --- mencoder.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'mencoder.c') diff --git a/mencoder.c b/mencoder.c index bc7f3b2b77..6714d49114 100644 --- a/mencoder.c +++ b/mencoder.c @@ -810,7 +810,6 @@ mux_a->source=sh_audio; 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 @@ if(!preinit_audio_filters(sh_audio, } 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); -- cgit v1.2.3