hadamard/AltiVec: fix to compiler fix, again by (Romain Dolbeau <dolbeau at irisa...
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 8 Jun 2004 02:41:41 +0000 (02:41 +0000)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 8 Jun 2004 02:41:41 +0000 (02:41 +0000)
Originally committed as revision 3207 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavcodec/ppc/dsputil_altivec.c
libavcodec/ppc/dsputil_ppc.c

index f8243d0..60e63c7 100644 (file)
@@ -1302,7 +1302,7 @@ POWERPC_PERF_STOP_COUNT(altivec_put_no_rnd_pixels16_xy2_num, 1);
 #endif /* ALTIVEC_USE_REFERENCE_C_CODE */
 }
 
-#if (__GNUC__ * 100 + __GNUC_MINOR__ * 10 >= 330)
+#ifdef CONFIG_DARWIN
 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);
   int sum;
@@ -1612,7 +1612,7 @@ POWERPC_PERF_START_COUNT(altivec_hadamard8_diff16_num, 1);
 POWERPC_PERF_STOP_COUNT(altivec_hadamard8_diff16_num, 1);
   return score;
 }
-#endif // GCC >= 3.3
+#endif //CONFIG_DARWIN
 
 int has_altivec(void)
 {
index da4336c..ea1d499 100644 (file)
@@ -278,7 +278,7 @@ void dsputil_init_ppc(DSPContext* c, AVCodecContext *avctx)
         
        c->gmc1 = gmc1_altivec;
 
-#if (__GNUC__ * 100 + __GNUC_MINOR__ * 10 >= 330)
+#ifdef CONFIG_DARWIN // ATM gcc-3.3 and gcc-3.4 fail to compile these in linux...
        c->hadamard8_diff[0] = hadamard8_diff16_altivec;
        c->hadamard8_diff[1] = hadamard8_diff8x8_altivec;
 #endif