diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-06-24 10:50:53 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-06-24 10:50:53 +0000 |
| commit | d22ae4a4d9a4f573602ad2ea8178810aaf7f69d2 (patch) | |
| tree | 0a3bfb4247f5c02e0d9a585655755c3b5f6ad065 /mencoder.c | |
| parent | 2f79d1aa8d7d27047b50be6ae22de220ebec2cf6 (diff) | |
| download | mpv-d22ae4a4d9a4f573602ad2ea8178810aaf7f69d2.tar.bz2 mpv-d22ae4a4d9a4f573602ad2ea8178810aaf7f69d2.tar.xz | |
make -srate work again, unify audio filter init and preinit.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15812 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mencoder.c')
| -rw-r--r-- | mencoder.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/mencoder.c b/mencoder.c index 70470cccfc..1e8251a400 100644 --- a/mencoder.c +++ b/mencoder.c @@ -819,9 +819,9 @@ mux_a->source=sh_audio; mux_a->codec=out_audio_codec; -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; +ao_data.samplerate = force_srate; +ao_data.channels = 0; +ao_data.format = audio_output_format; if(!preinit_audio_filters(sh_audio, // input: new_srate, @@ -833,7 +833,7 @@ if(!preinit_audio_filters(sh_audio, } aparams.channels = ao_data.channels; -aparams.sample_rate = force_srate ? force_srate : ao_data.samplerate; +aparams.sample_rate = ao_data.samplerate; aparams.audio_preload = 1000 * audio_preload; if(mux_a->codec != ACODEC_COPY) { aencoder = new_audio_encoder(mux_a, &aparams); @@ -841,7 +841,7 @@ if(mux_a->codec != ACODEC_COPY) { mencoder_exit(1, NULL); if(!init_audio_filters(sh_audio, new_srate, sh_audio->channels, sh_audio->sample_format, - aparams.sample_rate, aparams.channels, aencoder->input_format, + &aparams.sample_rate, &aparams.channels, &aencoder->input_format, aencoder->min_buffer_size, aencoder->max_buffer_size)) { mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_NoMatchingFilter); mencoder_exit(1,NULL); @@ -951,9 +951,9 @@ else if (sh_audio) { new_srate, sh_audio->channels, sh_audio->sample_format, - mux_a->wf->nSamplesPerSec, - mux_a->wf->nChannels, - out_format, + &mux_a->wf->nSamplesPerSec, + &mux_a->wf->nChannels, + &out_format, out_minsize, out_maxsize)) { |