[FFmpeg-cvslog] swr: disable 1 stage convert when dither is enabled.

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue May  1 20:12:31 2012 +0200| [046b5339fccebba331ce8fe28b53693c153831cd] | committer: Michael Niedermayer

swr: disable 1 stage convert when dither is enabled.

This combination is not possible easily.

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=046b5339fccebba331ce8fe28b53693c153831cd
---

 libswresample/swresample.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libswresample/swresample.c b/libswresample/swresample.c
index 7f545e0..9429c1e 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;