From 046b5339fccebba331ce8fe28b53693c153831cd Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Tue, 1 May 2012 20:12:31 +0200 Subject: [PATCH] swr: disable 1 stage convert when dither is enabled. This combination is not possible easily. Signed-off-by: Michael Niedermayer --- libswresample/swresample.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libswresample/swresample.c b/libswresample/swresample.c index 7f545e0aee..9429c1ee45 100644 --- a/libswresample/swresample.c +++ b/libswresample/swresample.c @@ -274,7 +274,7 @@ av_assert0(s->out.ch_count); 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-> in_sample_fmt, s-> in.ch_count, NULL, 0); return 0;