diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-06 12:18:25 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-06 12:18:25 +0100 |
| commit | ede45c4e1da8bd2fefc89ea63e57a49e6c0a3e19 (patch) | |
| tree | c288d3a3a358016a16aefbe702b454a9777cf98f /libavcodec/motion_est.c | |
| parent | 127ff88639e78b9d16fecb973c41b86a843b4fa7 (diff) | |
| parent | 25841dfe806a13de526ae09c11149ab1f83555a8 (diff) | |
| download | ffmpeg-ede45c4e1da8bd2fefc89ea63e57a49e6c0a3e19.tar.gz | |
Merge commit '25841dfe806a13de526ae09c11149ab1f83555a8'
* commit '25841dfe806a13de526ae09c11149ab1f83555a8':
Use ptrdiff_t instead of int for {avg, put}_pixels line_size parameter.
Conflicts:
libavcodec/alpha/dsputil_alpha.c
libavcodec/dsputil_template.c
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 ce61cab15b..5fafb1bb13 100644 --- a/libavcodec/motion_est.c +++ b/libavcodec/motion_est.c @@ -290,7 +290,7 @@ static int zero_cmp(void *s, uint8_t *a, uint8_t *b, int stride, int h){ return 0; } -static void zero_hpel(uint8_t *a, const uint8_t *b, int stride, int h){ +static void zero_hpel(uint8_t *a, const uint8_t *b, ptrdiff_t stride, int h){ } int ff_init_me(MpegEncContext *s){ |