Merge commit '82bb3048013201c0095d2853d4623633d912252f'

* commit '82bb3048013201c0095d2853d4623633d912252f': dsputil: Use correct type in me_cmp_func function pointer

Michael Niedermayer committed 12 years ago

Commit e98bac82 parents 011d83d 82bb3049 files · +95 −91Browse files

Showing the changes to libavcodec/arm (1 of 9 files). Show all

Unified · Split

 #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);
 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);

Keyboard shortcuts