h264: (trivial) remove unneeded macro argument in x86/cabac.h

[ffmpeg] / libavcodec / resample.c

diff --git a/libavcodec/resample.c b/libavcodec/resample.c
index f1a2dbf6dc61b42bf8f3cf5bfba3af7257f41ffb..a601e7aac70b8d84e53c5a8a90f77ac41c78dfa1 100644 (file)
--- a/libavcodec/resample.c
+++ b/libavcodec/resample.c
@@ -323,11 +323,13 @@ int audio_resample(ReSampleContext *s, short *output, short *input, int nb_sampl
     lenout= 2*s->output_channels*nb_samples * s->ratio + 16;
 
     if (s->sample_fmt[1] != AV_SAMPLE_FMT_S16) {
+        int out_size = lenout * av_get_bytes_per_sample(s->sample_fmt[1]) *
+                       s->output_channels;
         output_bak = output;
 
-        if (!s->buffer_size[1] || s->buffer_size[1] < 2*lenout) {
+        if (!s->buffer_size[1] || s->buffer_size[1] < out_size) {
             av_free(s->buffer[1]);
-            s->buffer_size[1] = 2*lenout;
+            s->buffer_size[1] = out_size;
             s->buffer[1] = av_malloc(s->buffer_size[1]);
             if (!s->buffer[1]) {
                 av_log(s->resample_context, AV_LOG_ERROR, "Could not allocate buffer\n");