diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2004-06-08 02:41:41 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2004-06-08 02:41:41 +0000 |
| commit | 78421be13d6cab4b09ef7207511556e2dbea359f (patch) | |
| tree | f1b54b51aee3eb0925757cb7a184ef6ee2b6f8ee /libavcodec | |
| parent | 1ec4df0fa87dcd01c58555ec2b7250641ccad409 (diff) | |
| download | ffmpeg-78421be13d6cab4b09ef7207511556e2dbea359f.tar.gz | |
hadamard/AltiVec: fix to compiler fix, again by (Romain Dolbeau <dolbeau at irisa dot fr>)
Originally committed as revision 3207 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/ppc/dsputil_altivec.c | 4 | ||||
| -rw-r--r-- | libavcodec/ppc/dsputil_ppc.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/ppc/dsputil_altivec.c b/libavcodec/ppc/dsputil_altivec.c index f8243d0a0d..60e63c799d 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__ * 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) { diff --git a/libavcodec/ppc/dsputil_ppc.c b/libavcodec/ppc/dsputil_ppc.c index da4336c518..ea1d499e46 100644 --- a/libavcodec/ppc/dsputil_ppc.c +++ b/libavcodec/ppc/dsputil_ppc.c @@ -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 |