From 82bb3048013201c0095d2853d4623633d912252f Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Fri, 20 Dec 2013 15:44:16 +0100 Subject: dsputil: Use correct type in me_cmp_func function pointer --- libavcodec/motion_est.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'libavcodec/motion_est.c') diff --git a/libavcodec/motion_est.c b/libavcodec/motion_est.c index 08c0ebae98..8b597e846f 100644 --- a/libavcodec/motion_est.c +++ b/libavcodec/motion_est.c @@ -286,7 +286,9 @@ static int cmp_qpel(MpegEncContext *s, const int x, const int y, const int subx, #include "motion_est_template.c" -static int zero_cmp(void *s, uint8_t *a, uint8_t *b, int stride, int h){ +static int zero_cmp(MpegEncContext *s, uint8_t *a, uint8_t *b, + int stride, int h) +{ return 0; } -- cgit v1.2.3