[MPlayer-cvslog] CVS: main mencoder.c,1.286,1.287

[Nico Sabbi CVS]

CVS change done by Nico Sabbi CVS

Update of /cvsroot/mplayer/main
In directory mail:/var2/tmp/cvs-serv4441

Modified Files:
	mencoder.c 
Log Message:
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

Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.286
retrieving revision 1.287
diff -u -r1.286 -r1.287
--- mencoder.c	24 May 2005 08:29:45 -0000	1.286
+++ mencoder.c	24 May 2005 19:46:44 -0000	1.287
@@ -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);