From 83b26046fcce5f497042fd7c5d7ae6904d7b76e1 Mon Sep 17 00:00:00 2001
From: Justin Ruggles <justin.ruggles@gmail.com>
Date: Tue, 10 Apr 2012 10:53:55 -0400
Subject: avutil: change default buffer size alignment for sample buffer
 functions

Aligning nb_samples will give both correct plane pointer alignment and enough
padding for SIMD-optimized functions.
---
 libavutil/samplefmt.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'libavutil/samplefmt.c')

diff --git a/libavutil/samplefmt.c b/libavutil/samplefmt.c
index 2e0aa98f58..0a2ffa0387 100644
--- a/libavutil/samplefmt.c
+++ b/libavutil/samplefmt.c
@@ -124,8 +124,10 @@ int av_samples_get_buffer_size(int *linesize, int nb_channels, int nb_samples,
         return AVERROR(EINVAL);
 
     /* auto-select alignment if not specified */
-    if (!align)
-        align = 32;
+    if (!align) {
+        align = 1;
+        nb_samples = FFALIGN(nb_samples, 32);
+    }
 
     /* check for integer overflow */
     if (nb_channels > INT_MAX / align ||
-- 
cgit v1.2.3