diff options
| author | rfelker <rfelker@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-05-24 08:29:45 +0000 |
|---|---|---|
| committer | rfelker <rfelker@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-05-24 08:29:45 +0000 |
| commit | ec7e1a378c98fcebd191b54c7d737a190a1da3d3 (patch) | |
| tree | 4904f6a76f956878c79a2bf7be6feb4985ed6906 /mencoder.c | |
| parent | 8c1d197ba7f05b1444e77664c3ac846c0351436f (diff) | |
| download | mpv-ec7e1a378c98fcebd191b54c7d737a190a1da3d3.tar.bz2 mpv-ec7e1a378c98fcebd191b54c7d737a190a1da3d3.tar.xz | |
disable preinit until it's fixed (it breaks -speed...codec is initialized with wrong samplerate)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15562 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mencoder.c')
| -rw-r--r-- | mencoder.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/mencoder.c b/mencoder.c index eefa834b2b..bc7f3b2b77 100644 --- a/mencoder.c +++ b/mencoder.c @@ -810,6 +810,7 @@ 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,6 +826,10 @@ 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.audio_preload = 1000 * audio_preload; if(mux_a->codec != ACODEC_COPY) { aencoder = new_audio_encoder(mux_a, &aparams); |