summaryrefslogtreecommitdiff
authorMichael Niedermayer <michaelni@gmx.at>2013-06-05 00:47:19 (GMT)
committer Michael Niedermayer <michaelni@gmx.at>2013-06-05 01:06:34 (GMT)
commit6bc4e36ba7c4f87a5ade89d53d91fc237e0a895b (patch)
tree5498d57c3e5fec498ee3410579143aaf49e05a60
parent449558d34a243e30b648f8ba0f878e7278c49c4a (diff)
downloadffmpeg-6bc4e36ba7c4f87a5ade89d53d91fc237e0a895b.zip
ffmpeg-6bc4e36ba7c4f87a5ade89d53d91fc237e0a895b.tar.gz
ffmpeg-6bc4e36ba7c4f87a5ade89d53d91fc237e0a895b.tar.bz2
swr: set scale for 32->32/24 dither
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat
-rw-r--r--libswresample/dither.c1
1 files changed, 1 insertions, 0 deletions
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;