avcodec_decode_audio: do not trust the channel layout, use the channel count.

[ffmpeg] / libswresample / dither.c

diff --git a/libswresample/dither.c b/libswresample/dither.c
index d7a5b6b55876ef45e9b215e4c8dc6368fffda716..d70505c27ef4b8498276543bbe0a697eee9cbe66 100644 (file)
--- a/libswresample/dither.c
+++ b/libswresample/dither.c
@@ -97,7 +97,7 @@ int swri_dither_init(SwrContext *s, enum AVSampleFormat out_fmt, enum AVSampleFo
     s->dither.ns_pos = 0;
     s->dither.noise_scale=   scale;
     s->dither.ns_scale   =   scale;
-    s->dither.ns_scale_1 = 1/scale;
+    s->dither.ns_scale_1 = scale ? 1/scale : 0;
     memset(s->dither.ns_errors, 0, sizeof(s->dither.ns_errors));
     for (i=0; filters[i].coefs; i++) {
         const filter_t *f = &filters[i];
@@ -115,7 +115,9 @@ int swri_dither_init(SwrContext *s, enum AVSampleFormat out_fmt, enum AVSampleFo
         s->dither.method = SWR_DITHER_TRIANGULAR_HIGHPASS;
     }
 
+    av_assert0(!s->preout.count);
     s->dither.noise = s->preout;
+    s->dither.temp  = s->preout;
     if (s->dither.method > SWR_DITHER_NS) {
         s->dither.noise.bps = 4;
         s->dither.noise.fmt = AV_SAMPLE_FMT_FLTP;