Commit 3cf1e291 authored by Michael Niedermayer's avatar Michael Niedermayer

hadamard/AltiVec: fix to compiler fix by (Romain Dolbeau <dolbeau at irisa dot fr>)

Originally committed as revision 3195 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent af05c29a
...@@ -1302,7 +1302,7 @@ POWERPC_PERF_STOP_COUNT(altivec_put_no_rnd_pixels16_xy2_num, 1); ...@@ -1302,7 +1302,7 @@ POWERPC_PERF_STOP_COUNT(altivec_put_no_rnd_pixels16_xy2_num, 1);
#endif /* ALTIVEC_USE_REFERENCE_C_CODE */ #endif /* ALTIVEC_USE_REFERENCE_C_CODE */
} }
#if (__GNUC__ * 100 + __GNUC_MINOR__ >= 330) #if (__GNUC__ * 100 + __GNUC_MINOR__ * 10 >= 330)
int hadamard8_diff8x8_altivec(/*MpegEncContext*/ void *s, uint8_t *dst, uint8_t *src, int stride, int h){ int hadamard8_diff8x8_altivec(/*MpegEncContext*/ void *s, uint8_t *dst, uint8_t *src, int stride, int h){
POWERPC_PERF_DECLARE(altivec_hadamard8_diff8x8_num, 1); POWERPC_PERF_DECLARE(altivec_hadamard8_diff8x8_num, 1);
int sum; int sum;
...@@ -1612,7 +1612,7 @@ POWERPC_PERF_START_COUNT(altivec_hadamard8_diff16_num, 1); ...@@ -1612,7 +1612,7 @@ POWERPC_PERF_START_COUNT(altivec_hadamard8_diff16_num, 1);
POWERPC_PERF_STOP_COUNT(altivec_hadamard8_diff16_num, 1); POWERPC_PERF_STOP_COUNT(altivec_hadamard8_diff16_num, 1);
return score; return score;
} }
#endif #endif // GCC >= 3.3
int has_altivec(void) int has_altivec(void)
{ {
......
...@@ -279,7 +279,7 @@ void dsputil_init_ppc(DSPContext* c, AVCodecContext *avctx) ...@@ -279,7 +279,7 @@ void dsputil_init_ppc(DSPContext* c, AVCodecContext *avctx)
c->gmc1 = gmc1_altivec; c->gmc1 = gmc1_altivec;
#if (__GNUC__ * 100 + __GNUC_MINOR__ >= 330) #if (__GNUC__ * 100 + __GNUC_MINOR__ * 10 >= 330)
c->hadamard8_diff[0] = hadamard8_diff16_altivec; c->hadamard8_diff[0] = hadamard8_diff16_altivec;
c->hadamard8_diff[1] = hadamard8_diff8x8_altivec; c->hadamard8_diff[1] = hadamard8_diff8x8_altivec;
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment