swr: disable 1 stage convert when dither is enabled.
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 1 May 2012 18:12:31 +0000 (20:12 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 1 May 2012 18:12:31 +0000 (20:12 +0200)
This combination is not possible easily.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libswresample/swresample.c

index 7f545e0..9429c1e 100644 (file)
@@ -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;