Merge commit '02ec656af72030eea4f3d63e30b25625cce6a3df'

[ffmpeg] / libswresample / dither.c

diff --git a/libswresample/dither.c b/libswresample/dither.c
index d0193dda461f90daf6bf1d291682fde529a41558..7cbe410557d63a3f1999f0c8a295252a41d3260f 100644 (file)
--- 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;