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/snow_dwt.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/snow_dwt.h')
| -rw-r--r-- | libavcodec/snow_dwt.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/snow_dwt.h b/libavcodec/snow_dwt.h index e929189672..6ac49e2b9e 100644 --- a/libavcodec/snow_dwt.h +++ b/libavcodec/snow_dwt.h @@ -105,8 +105,8 @@ void ff_snow_inner_add_yblock(const uint8_t *obmc, const int obmc_stride, int src_y, int src_stride, slice_buffer *sb, int add, uint8_t *dst8); -int ff_w53_32_c(struct MpegEncContext *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h); -int ff_w97_32_c(struct MpegEncContext *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h); +int ff_w53_32_c(struct MpegEncContext *v, uint8_t *pix1, uint8_t *pix2, ptrdiff_t line_size, int h); +int ff_w97_32_c(struct MpegEncContext *v, uint8_t *pix1, uint8_t *pix2, ptrdiff_t line_size, int h); void ff_spatial_dwt(int *buffer, int *temp, int width, int height, int stride, int type, int decomposition_count); |