* commit '82bb3048013201c0095d2853d4623633d912252f': dsputil: Use correct type in me_cmp_func function pointer
Showing the changes to libavcodec/arm (1 of 9 files). Show all
Unified · Split
| @@ -23,6 +23,7 @@ · 22 unmodified lines | ||
| 23 | 23 | #include "libavutil/attributes.h" |
| 24 | 24 | #include "libavcodec/avcodec.h" |
| 25 | 25 | #include "libavcodec/dsputil.h" |
| 26 | +#include "libavcodec/mpegvideo.h" | |
| 26 | 27 | #include "dsputil_arm.h" |
| 27 | 28 | |
| 28 | 29 | 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); · 7 unmodified lines | ||
| 36 | 37 | void ff_diff_pixels_armv6(int16_t *block, const uint8_t *s1, |
| 37 | 38 | const uint8_t *s2, int stride); |
| 38 | 39 | |
| 39 | −int ff_pix_abs16_armv6(void *s, uint8_t *blk1, uint8_t *blk2, | |
| 40 | +int ff_pix_abs16_armv6(MpegEncContext *s, uint8_t *blk1, uint8_t *blk2, | |
| 40 | 41 | int line_size, int h); |
| 41 | −int ff_pix_abs16_x2_armv6(void *s, uint8_t *blk1, uint8_t *blk2, | |
| 42 | +int ff_pix_abs16_x2_armv6(MpegEncContext *s, uint8_t *blk1, uint8_t *blk2, | |
| 42 | 43 | int line_size, int h); |
| 43 | −int ff_pix_abs16_y2_armv6(void *s, uint8_t *blk1, uint8_t *blk2, | |
| 44 | +int ff_pix_abs16_y2_armv6(MpegEncContext *s, uint8_t *blk1, uint8_t *blk2, | |
| 44 | 45 | int line_size, int h); |
| 45 | 46 | |
| 46 | −int ff_pix_abs8_armv6(void *s, uint8_t *blk1, uint8_t *blk2, | |
| 47 | +int ff_pix_abs8_armv6(MpegEncContext *s, uint8_t *blk1, uint8_t *blk2, | |
| 47 | 48 | int line_size, int h); |
| 48 | 49 | |
| 49 | −int ff_sse16_armv6(void *s, uint8_t *blk1, uint8_t *blk2, | |
| 50 | +int ff_sse16_armv6(MpegEncContext *s, uint8_t *blk1, uint8_t *blk2, | |
| 50 | 51 | int line_size, int h); |
| 51 | 52 | |
| 52 | 53 | int ff_pix_norm1_armv6(uint8_t *pix, int line_size); |