From 4094fc9971058b5a11c38d3294141c3220a2b691 Mon Sep 17 00:00:00 2001 From: Justin Ruggles Date: Wed, 21 Mar 2012 16:56:49 -0400 Subject: [PATCH] avconv: fix the resampling safety factors for output audio buffer allocation This matches the output size required for audio_resample() --- avconv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/avconv.c b/avconv.c index d3f9540d04..b83662c893 100644 --- a/avconv.c +++ b/avconv.c @@ -1020,7 +1020,7 @@ static int alloc_audio_output_buf(AVCodecContext *dec, AVCodecContext *enc, /* calculate required number of samples to allocate */ audio_buf_samples = ((int64_t)nb_samples * enc->sample_rate + dec->sample_rate) / dec->sample_rate; - audio_buf_samples = audio_buf_samples * 2 + 10000; // safety factors for the deprecated resampling API + audio_buf_samples = 4 * audio_buf_samples + 16; // safety factors for resampling audio_buf_samples = FFMAX(audio_buf_samples, enc->frame_size); if (audio_buf_samples > INT_MAX) return AVERROR(EINVAL);