summaryrefslogtreecommitdiff
path: root/libavcodec/ppc
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2004-06-05 22:26:03 +0000
committerMichael Niedermayer <michaelni@gmx.at>2004-06-05 22:26:03 +0000
commit3cf1e291f8bd6ea0e70d2854da51a5603b732aa1 (patch)
treebb119088692b55c7f6712e8ccffe9613cb32fee2 /libavcodec/ppc
parentaf05c29a1f0ae7bfdd056617bc6649aa3db763e3 (diff)
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
Diffstat (limited to 'libavcodec/ppc')
-rw-r--r--libavcodec/ppc/dsputil_altivec.c4
-rw-r--r--libavcodec/ppc/dsputil_ppc.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/ppc/dsputil_altivec.c b/libavcodec/ppc/dsputil_altivec.c
index ff6e870b7c..b5ac91f6fa 100644
--- a/libavcodec/ppc/dsputil_altivec.c
+++ b/libavcodec/ppc/dsputil_altivec.c
@@ -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__ >= 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){
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
+#endif // GCC >= 3.3
int has_altivec(void)
{
diff --git a/libavcodec/ppc/dsputil_ppc.c b/libavcodec/ppc/dsputil_ppc.c
index 55a4587f95..226e709a34 100644
--- a/libavcodec/ppc/dsputil_ppc.c
+++ b/libavcodec/ppc/dsputil_ppc.c
@@ -279,7 +279,7 @@ void dsputil_init_ppc(DSPContext* c, AVCodecContext *avctx)
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[1] = hadamard8_diff8x8_altivec;
#endif