Merge commit '82bb3048013201c0095d2853d4623633d912252f'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>

1 files changed, 11 insertions, 10 deletions

diff --git a/libavcodec/ppc/dsputil_altivec.c b/libavcodec/ppc/dsputil_altivec.c
index eb8e5703c6..cb6f1e1329 100644
--- a/libavcodec/ppc/dsputil_altivec.c
+++ b/libavcodec/ppc/dsputil_altivec.c
@@ -30,9 +30,10 @@
 #include "libavutil/ppc/util_altivec.h"
 #include "libavcodec/avcodec.h"
 #include "libavcodec/dsputil.h"
+#include "libavcodec/mpegvideo.h"
 #include "dsputil_altivec.h"
 
-static int sad16_x2_altivec(void *v, uint8_t *pix1, uint8_t *pix2,
+static int sad16_x2_altivec(MpegEncContext *v, uint8_t *pix1, uint8_t *pix2,
                             int line_size, int h)
 {
     int i, s = 0;
@@ -74,7 +75,7 @@ static int sad16_x2_altivec(void *v, uint8_t *pix1, uint8_t *pix2,
     return s;
 }
 
-static int sad16_y2_altivec(void *v, uint8_t *pix1, uint8_t *pix2,
+static int sad16_y2_altivec(MpegEncContext *v, uint8_t *pix1, uint8_t *pix2,
                             int line_size, int h)
 {
     int i, s = 0;
@@ -128,7 +129,7 @@ static int sad16_y2_altivec(void *v, uint8_t *pix1, uint8_t *pix2,
     return s;
 }
 
-static int sad16_xy2_altivec(void *v, uint8_t *pix1, uint8_t *pix2,
+static int sad16_xy2_altivec(MpegEncContext *v, uint8_t *pix1, uint8_t *pix2,
                              int line_size, int h)
 {
     int i, s = 0;
@@ -223,7 +224,7 @@ static int sad16_xy2_altivec(void *v, uint8_t *pix1, uint8_t *pix2,
     return s;
 }
 
-static int sad16_altivec(void *v, uint8_t *pix1, uint8_t *pix2,
+static int sad16_altivec(MpegEncContext *v, uint8_t *pix1, uint8_t *pix2,
                          int line_size, int h)
 {
     int i, s;
@@ -260,7 +261,7 @@ static int sad16_altivec(void *v, uint8_t *pix1, uint8_t *pix2,
     return s;
 }
 
-static int sad8_altivec(void *v, uint8_t *pix1, uint8_t *pix2,
+static int sad8_altivec(MpegEncContext *v, uint8_t *pix1, uint8_t *pix2,
                         int line_size, int h)
 {
     int i, s;
@@ -337,7 +338,7 @@ static int pix_norm1_altivec(uint8_t *pix, int line_size)
 
 /* Sum of Squared Errors for an 8x8 block, AltiVec-enhanced.
  * It's the sad8_altivec code above w/ squaring added. */
-static int sse8_altivec(void *v, uint8_t *pix1, uint8_t *pix2,
+static int sse8_altivec(MpegEncContext *v, uint8_t *pix1, uint8_t *pix2,
                         int line_size, int h)
 {
     int i, s;
@@ -389,7 +390,7 @@ static int sse8_altivec(void *v, uint8_t *pix1, uint8_t *pix2,
 
 /* Sum of Squared Errors for a 16x16 block, AltiVec-enhanced.
  * It's the sad16_altivec code above w/ squaring added. */
-static int sse16_altivec(void *v, uint8_t *pix1, uint8_t *pix2,
+static int sse16_altivec(MpegEncContext *v, uint8_t *pix1, uint8_t *pix2,
                          int line_size, int h)
 {
     int i, s;
@@ -587,7 +588,7 @@ static void add_bytes_altivec(uint8_t *dst, uint8_t *src, int w)
         dst[i] = src[i];
 }
 
-static int hadamard8_diff8x8_altivec(/* MpegEncContext */ void *s, uint8_t *dst,
+static int hadamard8_diff8x8_altivec(MpegEncContext *s, uint8_t *dst,
                                      uint8_t *src, int stride, int h)
 {
     int sum;
@@ -716,7 +717,7 @@ static int hadamard8_diff8x8_altivec(/* MpegEncContext */ void *s, uint8_t *dst,
  * On the 970, the hand-made RA is still a win (around 690 vs. around 780),
  * but xlc goes to around 660 on the regular C code...
  */
-static int hadamard8_diff16x8_altivec(/* MpegEncContext */ void *s, uint8_t *dst,
+static int hadamard8_diff16x8_altivec(MpegEncContext *s, uint8_t *dst,
                                       uint8_t *src, int stride, int h)
 {
     int sum;
@@ -913,7 +914,7 @@ static int hadamard8_diff16x8_altivec(/* MpegEncContext */ void *s, uint8_t *dst
     return sum;
 }
 
-static int hadamard8_diff16_altivec(/* MpegEncContext */ void *s, uint8_t *dst,
+static int hadamard8_diff16_altivec(MpegEncContext *s, uint8_t *dst,
                                     uint8_t *src, int stride, int h)
 {
     int score = hadamard8_diff16x8_altivec(s, dst, src, stride, 8);