mirror of https://github.com/mpv-player/mpv
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
This commit is contained in:
parent
2538455a14
commit
22a08bc346
|
@ -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);
|
||||
|
|
Loading…
Reference in New Issue