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/motion_est.c | |
| parent | b4d8724ab28d63d1297f3e48f491d827e48b6a81 (diff) | |
| parent | 9c12c6ff9539e926df0b2a2299e915ae71872600 (diff) | |
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/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 c5bbf35e58..6826740b5a 100644 --- a/libavcodec/motion_est.c +++ b/libavcodec/motion_est.c @@ -290,7 +290,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; } |