OSDN Git Service

motion_est: Fix warning from zero_cmp() assignment
authorVittorio Giovara <vittorio.giovara@gmail.com>
Tue, 14 Apr 2015 11:32:06 +0000 (13:32 +0200)
committerVittorio Giovara <vittorio.giovara@gmail.com>
Sun, 19 Apr 2015 22:17:56 +0000 (23:17 +0100)
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

index b14160f..3f4faa4 100644 (file)
@@ -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;
 }