summaryrefslogtreecommitdiff
path: root/libavcodec/arm
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2017-03-19 14:54:25 -0300
committerJames Almer <jamrial@gmail.com>2017-03-19 14:54:25 -0300
commit4004d33fcbbb93eaf57b5a5f8b2412b7807f094f (patch)
treef32596facfa46be27ebdd99c4efe77e9b18df91d /libavcodec/arm
parent6a42a54b9de41d5eb1b246409e280c85194ed6ff (diff)
parentd9d26a3674f31f482f54e936fcb382160830877a (diff)
Merge commit 'd9d26a3674f31f482f54e936fcb382160830877a'
* commit 'd9d26a3674f31f482f54e936fcb382160830877a': vp56: Change type of stride parameters to ptrdiff_t Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/arm')
-rw-r--r--libavcodec/arm/vp6dsp_init_arm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/arm/vp6dsp_init_arm.c b/libavcodec/arm/vp6dsp_init_arm.c
index ed6832145e..a2f986c32d 100644
--- a/libavcodec/arm/vp6dsp_init_arm.c
+++ b/libavcodec/arm/vp6dsp_init_arm.c
@@ -25,8 +25,8 @@
#include "libavcodec/avcodec.h"
#include "libavcodec/vp56dsp.h"
-void ff_vp6_edge_filter_hor_neon(uint8_t *yuv, int stride, int t);
-void ff_vp6_edge_filter_ver_neon(uint8_t *yuv, int stride, int t);
+void ff_vp6_edge_filter_hor_neon(uint8_t *yuv, ptrdiff_t stride, int t);
+void ff_vp6_edge_filter_ver_neon(uint8_t *yuv, ptrdiff_t stride, int t);
av_cold void ff_vp6dsp_init_arm(VP56DSPContext *s, enum AVCodecID codec)
{