diff options
| author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2015-04-14 13:32:06 +0200 |
|---|---|---|
| committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2015-04-19 23:17:56 +0100 |
| commit | 0251c9be5a9d79cb669e97086a82dc4d44a917b0 (patch) | |
| tree | 354821b84a08dc381971bf1aa18f45ac6105a578 /libavcodec/motion_est.c | |
| parent | 4d593896aaa81356def8993e8c52294bd8bb2797 (diff) | |
| download | ffmpeg-0251c9be5a9d79cb669e97086a82dc4d44a917b0.tar.gz | |
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]
Diffstat (limited to 'libavcodec/motion_est.c')
| -rw-r--r-- | libavcodec/motion_est.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/motion_est.c b/libavcodec/motion_est.c index b14160f912..3f4faa42e8 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; } |