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

[Richard Felker CVS]

CVS change done by Richard Felker CVS

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

Modified Files:
	mencoder.c 
Log Message:
disable preinit until it's fixed (it breaks -speed...codec is initialized with wrong samplerate)

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