1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00

swr: disable 1 stage convert when dither is enabled.

This combination is not possible easily.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-05-01 20:12:31 +02:00
parent 30aa004f0c
commit 046b5339fc

View File

@ -274,7 +274,7 @@ av_assert0(s->out.ch_count);
s->in_buffer= s->in; s->in_buffer= s->in;
if(!s->resample && !s->rematrix && !s->channel_map){ if(!s->resample && !s->rematrix && !s->channel_map && !s->dither_method){
s->full_convert = swri_audio_convert_alloc(s->out_sample_fmt, s->full_convert = swri_audio_convert_alloc(s->out_sample_fmt,
s-> in_sample_fmt, s-> in.ch_count, NULL, 0); s-> in_sample_fmt, s-> in.ch_count, NULL, 0);
return 0; return 0;