summaryrefslogtreecommitdiff
path: root/libavutil/samplefmt.c
diff options
context:
space:
mode:
authorJustin Ruggles <justin.ruggles@gmail.com>2012-04-10 10:53:55 -0400
committerJustin Ruggles <justin.ruggles@gmail.com>2012-04-23 14:06:45 -0400
commit83b26046fcce5f497042fd7c5d7ae6904d7b76e1 (patch)
treeb855eb9b9b8c933ef1acce7372d6fbe70424525d /libavutil/samplefmt.c
parent0ca4414d0f3eeb39bbad504eaaae76d40b7189cc (diff)
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.
Diffstat (limited to 'libavutil/samplefmt.c')
-rw-r--r--libavutil/samplefmt.c6
1 files changed, 4 insertions, 2 deletions
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 ||