diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-24 11:39:26 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-24 12:13:00 +0100 |
| commit | ea41e6d6373063c3a2a9bf48ce8e1c2e6340b694 (patch) | |
| tree | dc454e62fb5233745a40d3d8110d17aed4c72317 /libavcodec/me_cmp.h | |
| parent | b4d8724ab28d63d1297f3e48f491d827e48b6a81 (diff) | |
| parent | 9c12c6ff9539e926df0b2a2299e915ae71872600 (diff) | |
| download | ffmpeg-ea41e6d6373063c3a2a9bf48ce8e1c2e6340b694.tar.gz | |
Merge commit '9c12c6ff9539e926df0b2a2299e915ae71872600'
* commit '9c12c6ff9539e926df0b2a2299e915ae71872600':
motion_est: convert stride to ptrdiff_t
Conflicts:
libavcodec/me_cmp.c
libavcodec/ppc/me_cmp.c
libavcodec/x86/me_cmp_init.c
See: 9c669672c7fd45ef1cad782ab551be438ceac6cd
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/me_cmp.h')
| -rw-r--r-- | libavcodec/me_cmp.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/me_cmp.h b/libavcodec/me_cmp.h index 0e3b9221bd..98ee53ce2a 100644 --- a/libavcodec/me_cmp.h +++ b/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 */); |