# HG changeset patch # User gpoirier # Date 1206872883 0 # Node ID d90bb7b51588e8e9f84e6244ea3bc0b8bac71eac # Parent fb6109c5f08bb29a9b3174bdba03f2070e821a6f get rid of the useless DCT_ERROR() macro patch by Alexander Strange %astrange A ithinksw P com% diff -r fb6109c5f08b -r d90bb7b51588 dct-test.c --- a/dct-test.c Sat Mar 29 22:27:25 2008 +0000 +++ b/dct-test.c Sun Mar 30 10:28:03 2008 +0000 @@ -82,41 +82,38 @@ #define FAAN_SCALE NO_PERM #endif -#define DCT_ERROR(name,is_idct,func,ref,form) {name,is_idct,func,ref,form} - - struct algo algos[] = { - DCT_ERROR( "REF-DBL", 0, fdct, fdct, NO_PERM), - DCT_ERROR("FAAN", 0, ff_faandct, fdct, FAAN_SCALE), - DCT_ERROR("FAANI", 1, ff_faanidct, idct, NO_PERM), - DCT_ERROR("IJG-AAN-INT", 0, fdct_ifast, fdct, SCALE_PERM), - DCT_ERROR("IJG-LLM-INT", 0, ff_jpeg_fdct_islow, fdct, NO_PERM), - DCT_ERROR("REF-DBL", 1, idct, idct, NO_PERM), - DCT_ERROR("INT", 1, j_rev_dct, idct, MMX_PERM), - DCT_ERROR("SIMPLE-C", 1, ff_simple_idct, idct, NO_PERM), + {"REF-DBL", 0, fdct, fdct, NO_PERM}, + {"FAAN", 0, ff_faandct, fdct, FAAN_SCALE}, + {"FAANI", 1, ff_faanidct, idct, NO_PERM}, + {"IJG-AAN-INT", 0, fdct_ifast, fdct, SCALE_PERM}, + {"IJG-LLM-INT", 0, ff_jpeg_fdct_islow, fdct, NO_PERM}, + {"REF-DBL", 1, idct, idct, NO_PERM}, + {"INT", 1, j_rev_dct, idct, MMX_PERM}, + {"SIMPLE-C", 1, ff_simple_idct, idct, NO_PERM}, #ifdef HAVE_MMX - DCT_ERROR("MMX", 0, ff_fdct_mmx, fdct, NO_PERM), + {"MMX", 0, ff_fdct_mmx, fdct, NO_PERM}, #ifdef HAVE_MMX2 - DCT_ERROR("MMX2", 0, ff_fdct_mmx2, fdct, NO_PERM), + {"MMX2", 0, ff_fdct_mmx2, fdct, NO_PERM}, #endif #ifdef CONFIG_GPL - DCT_ERROR("LIBMPEG2-MMX", 1, ff_mmx_idct, idct, MMX_PERM), - DCT_ERROR("LIBMPEG2-MMXEXT", 1, ff_mmxext_idct, idct, MMX_PERM), + {"LIBMPEG2-MMX", 1, ff_mmx_idct, idct, MMX_PERM}, + {"LIBMPEG2-MMXEXT", 1, ff_mmxext_idct, idct, MMX_PERM}, #endif - DCT_ERROR("SIMPLE-MMX", 1, ff_simple_idct_mmx, idct, MMX_SIMPLE_PERM), - DCT_ERROR("XVID-MMX", 1, ff_idct_xvid_mmx, idct, NO_PERM), - DCT_ERROR("XVID-MMX2", 1, ff_idct_xvid_mmx2, idct, NO_PERM), + {"SIMPLE-MMX", 1, ff_simple_idct_mmx, idct, MMX_SIMPLE_PERM}, + {"XVID-MMX", 1, ff_idct_xvid_mmx, idct, NO_PERM}, + {"XVID-MMX2", 1, ff_idct_xvid_mmx2, idct, NO_PERM}, #endif #ifdef HAVE_ALTIVEC - DCT_ERROR("altivecfdct", 0, fdct_altivec, fdct, NO_PERM), + {"altivecfdct", 0, fdct_altivec, fdct, NO_PERM}, #endif #ifdef ARCH_BFIN - DCT_ERROR("BFINfdct", 0, ff_bfin_fdct, fdct, NO_PERM), - DCT_ERROR("BFINidct", 1, ff_bfin_idct, idct, NO_PERM), + {"BFINfdct", 0, ff_bfin_fdct, fdct, NO_PERM}, + {"BFINidct", 1, ff_bfin_idct, idct, NO_PERM}, #endif { 0 }