diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-20 22:26:58 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-20 22:36:40 +0100 |
| commit | e98bac82e5152f492ef05deff562abb2c68ec2ca (patch) | |
| tree | 58771a16707237f10d5074213c625ef5160aabdb /libavcodec/arm | |
| parent | 011d83de488d2051c485a1618dda0a43d77bcbc7 (diff) | |
| parent | 82bb3048013201c0095d2853d4623633d912252f (diff) | |
| download | ffmpeg-e98bac82e5152f492ef05deff562abb2c68ec2ca.tar.gz | |
Merge commit '82bb3048013201c0095d2853d4623633d912252f'
* commit '82bb3048013201c0095d2853d4623633d912252f':
dsputil: Use correct type in me_cmp_func function pointer
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm')
| -rw-r--r-- | libavcodec/arm/dsputil_init_armv6.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/libavcodec/arm/dsputil_init_armv6.c b/libavcodec/arm/dsputil_init_armv6.c index 765ccb3151..17d55eaac7 100644 --- a/libavcodec/arm/dsputil_init_armv6.c +++ b/libavcodec/arm/dsputil_init_armv6.c @@ -23,6 +23,7 @@ #include "libavutil/attributes.h" #include "libavcodec/avcodec.h" #include "libavcodec/dsputil.h" +#include "libavcodec/mpegvideo.h" #include "dsputil_arm.h" void ff_simple_idct_armv6(int16_t *data); @@ -36,17 +37,17 @@ void ff_get_pixels_armv6(int16_t *block, const uint8_t *pixels, int stride); void ff_diff_pixels_armv6(int16_t *block, const uint8_t *s1, const uint8_t *s2, int stride); -int ff_pix_abs16_armv6(void *s, uint8_t *blk1, uint8_t *blk2, +int ff_pix_abs16_armv6(MpegEncContext *s, uint8_t *blk1, uint8_t *blk2, int line_size, int h); -int ff_pix_abs16_x2_armv6(void *s, uint8_t *blk1, uint8_t *blk2, +int ff_pix_abs16_x2_armv6(MpegEncContext *s, uint8_t *blk1, uint8_t *blk2, int line_size, int h); -int ff_pix_abs16_y2_armv6(void *s, uint8_t *blk1, uint8_t *blk2, +int ff_pix_abs16_y2_armv6(MpegEncContext *s, uint8_t *blk1, uint8_t *blk2, int line_size, int h); -int ff_pix_abs8_armv6(void *s, uint8_t *blk1, uint8_t *blk2, +int ff_pix_abs8_armv6(MpegEncContext *s, uint8_t *blk1, uint8_t *blk2, int line_size, int h); -int ff_sse16_armv6(void *s, uint8_t *blk1, uint8_t *blk2, +int ff_sse16_armv6(MpegEncContext *s, uint8_t *blk1, uint8_t *blk2, int line_size, int h); int ff_pix_norm1_armv6(uint8_t *pix, int line_size); |