Imported Debian version 2.5.0~trusty1.1

[deb_ffmpeg.git] / ffmpeg / libavcodec / me_cmp.h

diff --git a/ffmpeg/libavcodec/me_cmp.h b/ffmpeg/libavcodec/me_cmp.h
index 0e3b9221bdd8fac6af194e1952662f7fc0e64671..98ee53ce2acc7cb5a6b32346b38f3d06e1da5a1c 100644 (file)
--- a/ffmpeg/libavcodec/me_cmp.h
+++ b/ffmpeg/libavcodec/me_cmp.h
@@ -47,7 +47,8 @@ struct MpegEncContext;
  * width < 8 are neither used nor implemented. */
 typedef int (*me_cmp_func)(struct MpegEncContext *c,
                            uint8_t *blk1 /* align width (8 or 16) */,
-                           uint8_t *blk2 /* align 1 */, int line_size, int h);
+                           uint8_t *blk2 /* align 1 */, ptrdiff_t stride,
+                           int h);
 
 typedef struct MECmpContext {
     int (*sum_abs_dctelem)(int16_t *block /* align 16 */);