Merge remote branch 'qatar/master'

[ffmpeg] / libavcodec / resample.c

diff --git a/libavcodec/resample.c b/libavcodec/resample.c
index 45fba69f456e44f47e950b496af294878d22d7f3..ed2b31bd317e6f0474affac57f4cbca71a0ae85c 100644 (file)
--- a/libavcodec/resample.c
+++ b/libavcodec/resample.c
@@ -274,7 +274,7 @@ int audio_resample(ReSampleContext *s, short *output, short *input, int nb_sampl
         input  = s->buffer[0];
     }
 
-    lenout= 4*nb_samples * s->ratio + 16;
+    lenout= 2*s->output_channels*nb_samples * s->ratio + 16;
 
     if (s->sample_fmt[1] != AV_SAMPLE_FMT_S16) {
         output_bak = output;