diff options
author | Diego Biurrun <diego@biurrun.de> | 2013-12-20 15:44:16 +0100 |
---|---|---|
committer | Diego Biurrun <diego@biurrun.de> | 2014-03-20 05:03:23 -0700 |
commit | 82bb3048013201c0095d2853d4623633d912252f (patch) | |
tree | 4b8e701fed59b8b2f37ac82c36143a69b67b7722 /libavcodec/motion_est.c | |
parent | 0e083d7e43805db1a978cb57bfa25fda62e8ff18 (diff) | |
download | ffmpeg-82bb3048013201c0095d2853d4623633d912252f.tar.gz |
dsputil: Use correct type in me_cmp_func function pointer
Diffstat (limited to 'libavcodec/motion_est.c')
-rw-r--r-- | libavcodec/motion_est.c | 4 |
1 files changed, 3 insertions, 1 deletions
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; } |