aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/arm
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2017-03-21 15:59:31 -0300
committerJames Almer <jamrial@gmail.com>2017-03-21 16:04:22 -0300
commit9a0fbb9ca9256a2d081e440025b12f390d7380df (patch)
tree8cd8e0e41a94193b8aa99060ea0910f79028f4af /libavcodec/arm
parenta0478341f34be544e28b83ecfd768922de309416 (diff)
parent2caa93b813adc5dbb7771dfe615da826a2947d18 (diff)
downloadffmpeg-9a0fbb9ca9256a2d081e440025b12f390d7380df.tar.gz
Merge commit '2caa93b813adc5dbb7771dfe615da826a2947d18'
* commit '2caa93b813adc5dbb7771dfe615da826a2947d18': mpegaudiodsp: Change type of array stride parameters to ptrdiff_t Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/arm')
-rw-r--r--libavcodec/arm/mpegaudiodsp_init_arm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/arm/mpegaudiodsp_init_arm.c b/libavcodec/arm/mpegaudiodsp_init_arm.c
index 98e0c8a3a8..d87bd27ad8 100644
--- a/libavcodec/arm/mpegaudiodsp_init_arm.c
+++ b/libavcodec/arm/mpegaudiodsp_init_arm.c
@@ -26,7 +26,7 @@
#include "config.h"
void ff_mpadsp_apply_window_fixed_armv6(int32_t *synth_buf, int32_t *window,
- int *dither, int16_t *out, int incr);
+ int *dither, int16_t *out, ptrdiff_t incr);
av_cold void ff_mpadsp_init_arm(MPADSPContext *s)
{