[FFmpeg-cvslog] swr: set scale for 32->32/24 dither

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jun  5 02:47:19 2013 +0200| [6bc4e36ba7c4f87a5ade89d53d91fc237e0a895b] | committer: Michael Niedermayer

swr: set scale for 32->32/24 dither

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

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

 libswresample/dither.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/libswresample/dither.c b/libswresample/dither.c
index d0193dd..7cbe410 100644
--- a/libswresample/dither.c
+++ b/libswresample/dither.c
@@ -88,6 +88,7 @@ int swri_dither_init(SwrContext *s, enum AVSampleFormat out_fmt, enum AVSampleFo
         if(out_fmt == AV_SAMPLE_FMT_S16) scale = 1.0/(1L<<15);
         if(out_fmt == AV_SAMPLE_FMT_U8 ) scale = 1.0/(1L<< 7);
     }
+    if(in_fmt == AV_SAMPLE_FMT_S32 && out_fmt == AV_SAMPLE_FMT_S32 && (s->dither.output_sample_bits&31)) scale = 1;
     if(in_fmt == AV_SAMPLE_FMT_S32 && out_fmt == AV_SAMPLE_FMT_S16) scale = 1L<<16;
     if(in_fmt == AV_SAMPLE_FMT_S32 && out_fmt == AV_SAMPLE_FMT_U8 ) scale = 1L<<24;
     if(in_fmt == AV_SAMPLE_FMT_S16 && out_fmt == AV_SAMPLE_FMT_U8 ) scale = 1L<<8;