From 0109a09dc3850eb5dbff84a7bb50eb252a5a8f22 Mon Sep 17 00:00:00 2001 From: Justin Ruggles Date: Tue, 27 Mar 2012 21:31:14 -0400 Subject: avutil: use align == 0 for default alignment in audio sample buffer functions --- libavutil/samplefmt.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'libavutil/samplefmt.c') diff --git a/libavutil/samplefmt.c b/libavutil/samplefmt.c index 761009f2e2..2e0aa98f58 100644 --- a/libavutil/samplefmt.c +++ b/libavutil/samplefmt.c @@ -123,6 +123,10 @@ int av_samples_get_buffer_size(int *linesize, int nb_channels, int nb_samples, if (!sample_size || nb_samples <= 0 || nb_channels <= 0) return AVERROR(EINVAL); + /* auto-select alignment if not specified */ + if (!align) + align = 32; + /* check for integer overflow */ if (nb_channels > INT_MAX / align || (int64_t)nb_channels * nb_samples > (INT_MAX - (align * nb_channels)) / sample_size) -- cgit v1.2.3