Mercurial > mplayer.hg
comparison mencoder.c @ 15561:6e2c6d2553bd
disable preinit until it's fixed (it breaks -speed...codec is initialized with wrong samplerate)
author | rfelker |
---|---|
date | Tue, 24 May 2005 08:29:45 +0000 |
parents | 7575f4b17b48 |
children | 1c1c7cd29707 |
comparison
equal
deleted
inserted
replaced
15560:3d1f21672c3e | 15561:6e2c6d2553bd |
---|---|
808 | 808 |
809 mux_a->source=sh_audio; | 809 mux_a->source=sh_audio; |
810 | 810 |
811 mux_a->codec=out_audio_codec; | 811 mux_a->codec=out_audio_codec; |
812 | 812 |
813 #if 0 | |
813 ao_data.samplerate = force_srate ? force_srate : new_srate; | 814 ao_data.samplerate = force_srate ? force_srate : new_srate; |
814 ao_data.channels = audio_output_channels ? audio_output_channels : sh_audio->channels; | 815 ao_data.channels = audio_output_channels ? audio_output_channels : sh_audio->channels; |
815 ao_data.format = audio_output_format ? audio_output_format : sh_audio->sample_format; | 816 ao_data.format = audio_output_format ? audio_output_format : sh_audio->sample_format; |
816 if(!preinit_audio_filters(sh_audio, | 817 if(!preinit_audio_filters(sh_audio, |
817 // input: | 818 // input: |
823 mencoder_exit(1, NULL); | 824 mencoder_exit(1, NULL); |
824 } | 825 } |
825 | 826 |
826 aparams.channels = ao_data.channels; | 827 aparams.channels = ao_data.channels; |
827 aparams.sample_rate = ao_data.samplerate; | 828 aparams.sample_rate = ao_data.samplerate; |
829 #else | |
830 aparams.channels = audio_output_channels ? audio_output_channels : sh_audio->channels; | |
831 aparams.sample_rate = force_srate ? force_srate : new_srate; | |
832 #endif | |
828 aparams.audio_preload = 1000 * audio_preload; | 833 aparams.audio_preload = 1000 * audio_preload; |
829 if(mux_a->codec != ACODEC_COPY) { | 834 if(mux_a->codec != ACODEC_COPY) { |
830 aencoder = new_audio_encoder(mux_a, &aparams); | 835 aencoder = new_audio_encoder(mux_a, &aparams); |
831 if(!aencoder) | 836 if(!aencoder) |
832 mencoder_exit(1, NULL); | 837 mencoder_exit(1, NULL); |