[FFmpeg-cvslog] avconv: fix the resampling safety factors for output audio buffer allocation
Justin Ruggles
git at videolan.org
Fri Mar 23 22:18:53 CET 2012
ffmpeg | branch: master | Justin Ruggles <justin.ruggles at gmail.com> | Wed Mar 21 16:56:49 2012 -0400| [4094fc9971058b5a11c38d3294141c3220a2b691] | committer: Justin Ruggles
avconv: fix the resampling safety factors for output audio buffer allocation
This matches the output size required for audio_resample()
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4094fc9971058b5a11c38d3294141c3220a2b691
---
avconv.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/avconv.c b/avconv.c
index d3f9540..b83662c 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);
More information about the ffmpeg-cvslog
mailing list