Module: libav Branch: master Commit: 0251c9be5a9d79cb669e97086a82dc4d44a917b0
Author: Vittorio Giovara <[email protected]> Committer: Vittorio Giovara <[email protected]> Date: Tue Apr 14 13:32:06 2015 +0200 motion_est: Fix warning from zero_cmp() assignment warning: incompatible pointer types assigning to 'me_cmp_func' (aka 'int (*)(struct MpegEncContext *, uint8_t *, uint8_t *, ptrdiff_t, int)') from 'int (MpegEncContext *, uint8_t *, uint8_t *, int, int)' [-Wincompatible-pointer-types] --- libavcodec/motion_est.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/motion_est.c b/libavcodec/motion_est.c index b14160f..3f4faa4 100644 --- a/libavcodec/motion_est.c +++ b/libavcodec/motion_est.c @@ -291,7 +291,7 @@ static int cmp_qpel(MpegEncContext *s, const int x, const int y, const int subx, #include "motion_est_template.c" static int zero_cmp(MpegEncContext *s, uint8_t *a, uint8_t *b, - int stride, int h) + ptrdiff_t stride, int h) { return 0; } _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
