diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2009-01-13 23:44:16 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2009-01-13 23:44:16 +0000 |
| commit | b250f9c66d3ddd84652d158fb979a5f21e3f2c71 (patch) | |
| tree | ef84366029d6f8af6ed82e90c5f188bb7dfc844d /libavcodec/dct-test.c | |
| parent | 959da985b03570cfe7d239c0ba6d550ecb04c460 (diff) | |
| download | ffmpeg-b250f9c66d3ddd84652d158fb979a5f21e3f2c71.tar.gz | |
Change semantic of CONFIG_*, HAVE_* and ARCH_*.
They are now always defined to either 0 or 1.
Originally committed as revision 16590 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/dct-test.c')
| -rw-r--r-- | libavcodec/dct-test.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/libavcodec/dct-test.c b/libavcodec/dct-test.c index 04f75b05f6..e7c12dd732 100644 --- a/libavcodec/dct-test.c +++ b/libavcodec/dct-test.c @@ -97,14 +97,14 @@ struct algo algos[] = { {"INT", 1, j_rev_dct, idct, MMX_PERM}, {"SIMPLE-C", 1, ff_simple_idct, idct, NO_PERM}, -#ifdef HAVE_MMX +#if HAVE_MMX {"MMX", 0, ff_fdct_mmx, fdct, NO_PERM, FF_MM_MMX}, -#ifdef HAVE_MMX2 +#if HAVE_MMX2 {"MMX2", 0, ff_fdct_mmx2, fdct, NO_PERM, FF_MM_MMXEXT}, {"SSE2", 0, ff_fdct_sse2, fdct, NO_PERM, FF_MM_SSE2}, #endif -#ifdef CONFIG_GPL +#if CONFIG_GPL {"LIBMPEG2-MMX", 1, ff_mmx_idct, idct, MMX_PERM, FF_MM_MMX}, {"LIBMPEG2-MMXEXT", 1, ff_mmxext_idct, idct, MMX_PERM, FF_MM_MMXEXT}, #endif @@ -114,25 +114,25 @@ struct algo algos[] = { {"XVID-SSE2", 1, ff_idct_xvid_sse2, idct, SSE2_PERM, FF_MM_SSE2}, #endif -#ifdef HAVE_ALTIVEC +#if HAVE_ALTIVEC {"altivecfdct", 0, fdct_altivec, fdct, NO_PERM, FF_MM_ALTIVEC}, #endif -#ifdef ARCH_BFIN +#if ARCH_BFIN {"BFINfdct", 0, ff_bfin_fdct, fdct, NO_PERM}, {"BFINidct", 1, ff_bfin_idct, idct, NO_PERM}, #endif -#ifdef ARCH_ARM +#if ARCH_ARM {"SIMPLE-ARM", 1, simple_idct_ARM, idct, NO_PERM }, {"INT-ARM", 1, j_rev_dct_ARM, idct, MMX_PERM }, -#ifdef HAVE_ARMV5TE +#if HAVE_ARMV5TE {"SIMPLE-ARMV5TE", 1, simple_idct_armv5te, idct, NO_PERM }, #endif -#ifdef HAVE_ARMV6 +#if HAVE_ARMV6 {"SIMPLE-ARMV6", 1, ff_simple_idct_armv6, idct, MMX_PERM }, #endif -#ifdef HAVE_NEON +#if HAVE_NEON {"SIMPLE-NEON", 1, ff_simple_idct_neon, idct, PARTTRANS_PERM }, #endif #endif /* ARCH_ARM */ @@ -186,7 +186,7 @@ static DCTELEM block_org[64] __attribute__ ((aligned (8))); static inline void mmx_emms(void) { -#ifdef HAVE_MMX +#if HAVE_MMX if (cpu_flags & FF_MM_MMX) __asm__ volatile ("emms\n\t"); #endif |