Mercurial > libavcodec.hg
changeset 5573:204273dd0349 libavcodec
Rename CONFIG_DARWIN to SYS_DARWIN, it is not configurable (in FFmpeg).
| author | diego |
|---|---|
| date | Wed, 22 Aug 2007 22:46:39 +0000 |
| parents | c6fac563ec28 |
| children | 33718fb21437 |
| files | dsputil.h ppc/dsputil_altivec.c ppc/dsputil_altivec.h ppc/gcc_fixes.h ppc/mpegvideo_altivec.c |
| diffstat | 5 files changed, 11 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/dsputil.h Wed Aug 22 17:26:49 2007 +0000 +++ b/dsputil.h Wed Aug 22 22:46:39 2007 +0000 @@ -554,7 +554,7 @@ extern int mm_flags; -#if defined(HAVE_ALTIVEC) && !defined(CONFIG_DARWIN) +#if defined(HAVE_ALTIVEC) && !defined(SYS_DARWIN) #define pixel altivec_pixel #include <altivec.h> #undef pixel
--- a/ppc/dsputil_altivec.c Wed Aug 22 17:26:49 2007 +0000 +++ b/ppc/dsputil_altivec.c Wed Aug 22 22:46:39 2007 +0000 @@ -26,7 +26,7 @@ #include "dsputil_altivec.h" -#ifdef CONFIG_DARWIN +#ifdef SYS_DARWIN #include <sys/sysctl.h> #elif __AMIGAOS4__ #include <exec/exec.h> @@ -49,7 +49,7 @@ canjump = 0; siglongjmp (jmpbuf, 1); } -#endif /* CONFIG_DARWIN */ +#endif /* SYS_DARWIN */ int sad16_x2_altivec(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h) { @@ -1428,7 +1428,7 @@ return 0; #else /* __AMIGAOS4__ */ -#ifdef CONFIG_DARWIN +#ifdef SYS_DARWIN int sels[2] = {CTL_HW, HW_VECTORUNIT}; int has_vu = 0; size_t len = sizeof(has_vu); @@ -1437,7 +1437,7 @@ err = sysctl(sels, 2, &has_vu, &len, NULL, 0); if (err == 0) return (has_vu != 0); -#else /* CONFIG_DARWIN */ +#else /* SYS_DARWIN */ /* no Darwin, do it the brute-force way */ /* this is borrowed from the libmpeg2 library */ { @@ -1456,7 +1456,7 @@ return 1; } } -#endif /* CONFIG_DARWIN */ +#endif /* SYS_DARWIN */ return 0; #endif /* __AMIGAOS4__ */ }
--- a/ppc/dsputil_altivec.h Wed Aug 22 17:26:49 2007 +0000 +++ b/ppc/dsputil_altivec.h Wed Aug 22 22:46:39 2007 +0000 @@ -44,7 +44,7 @@ #define WORD_s2 0x18,0x19,0x1a,0x1b #define WORD_s3 0x1c,0x1d,0x1e,0x1f -#ifdef CONFIG_DARWIN +#ifdef SYS_DARWIN #define vcprm(a,b,c,d) (const vector unsigned char)(WORD_ ## a, WORD_ ## b, WORD_ ## c, WORD_ ## d) #else #define vcprm(a,b,c,d) (const vector unsigned char){WORD_ ## a, WORD_ ## b, WORD_ ## c, WORD_ ## d} @@ -61,7 +61,7 @@ #define FLOAT_p 1. -#ifdef CONFIG_DARWIN +#ifdef SYS_DARWIN #define vcii(a,b,c,d) (const vector float)(FLOAT_ ## a, FLOAT_ ## b, FLOAT_ ## c, FLOAT_ ## d) #else #define vcii(a,b,c,d) (const vector float){FLOAT_ ## a, FLOAT_ ## b, FLOAT_ ## c, FLOAT_ ## d}
--- a/ppc/gcc_fixes.h Wed Aug 22 17:26:49 2007 +0000 +++ b/ppc/gcc_fixes.h Wed Aug 22 22:46:39 2007 +0000 @@ -27,7 +27,7 @@ #include <altivec.h> #endif -#ifdef CONFIG_DARWIN +#ifdef SYS_DARWIN # ifndef __MWERKS__ # define AVV(x...) (x) # else @@ -108,7 +108,7 @@ #endif -#endif /* CONFIG_DARWIN */ +#endif /* SYS_DARWIN */ #ifndef __MWERKS__ #define const_vector const vector