repositories
/
deb_ffmpeg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Debian version 2.5.0~trusty1.1
[deb_ffmpeg.git]
/
ffmpeg
/
libavcodec
/
arm
/
me_cmp_init_arm.c
diff --git
a/ffmpeg/libavcodec/arm/me_cmp_init_arm.c
b/ffmpeg/libavcodec/arm/me_cmp_init_arm.c
index eb48b383f55fe41060b2a39c8bd716e395c17dd6..03870a2bfa7578d6cbed764f16a8a8dc94742e94 100644
(file)
--- a/
ffmpeg/libavcodec/arm/me_cmp_init_arm.c
+++ b/
ffmpeg/libavcodec/arm/me_cmp_init_arm.c
@@
-26,17
+26,17
@@
#include "libavcodec/mpegvideo.h"
int ff_pix_abs16_armv6(MpegEncContext *s, uint8_t *blk1, uint8_t *blk2,
#include "libavcodec/mpegvideo.h"
int ff_pix_abs16_armv6(MpegEncContext *s, uint8_t *blk1, uint8_t *blk2,
-
int line_siz
e, int h);
+
ptrdiff_t strid
e, int h);
int ff_pix_abs16_x2_armv6(MpegEncContext *s, uint8_t *blk1, uint8_t *blk2,
int ff_pix_abs16_x2_armv6(MpegEncContext *s, uint8_t *blk1, uint8_t *blk2,
-
int line_siz
e, int h);
+
ptrdiff_t strid
e, int h);
int ff_pix_abs16_y2_armv6(MpegEncContext *s, uint8_t *blk1, uint8_t *blk2,
int ff_pix_abs16_y2_armv6(MpegEncContext *s, uint8_t *blk1, uint8_t *blk2,
-
int line_siz
e, int h);
+
ptrdiff_t strid
e, int h);
int ff_pix_abs8_armv6(MpegEncContext *s, uint8_t *blk1, uint8_t *blk2,
int ff_pix_abs8_armv6(MpegEncContext *s, uint8_t *blk1, uint8_t *blk2,
-
int line_siz
e, int h);
+
ptrdiff_t strid
e, int h);
int ff_sse16_armv6(MpegEncContext *s, uint8_t *blk1, uint8_t *blk2,
int ff_sse16_armv6(MpegEncContext *s, uint8_t *blk1, uint8_t *blk2,
-
int line_siz
e, int h);
+
ptrdiff_t strid
e, int h);
av_cold void ff_me_cmp_init_arm(MECmpContext *c, AVCodecContext *avctx)
{
av_cold void ff_me_cmp_init_arm(MECmpContext *c, AVCodecContext *avctx)
{