diff options
| author | Alexander Strange <astrange@ithinksw.com> | 2008-03-30 10:28:03 +0000 |
|---|---|---|
| committer | Guillaume Poirier <gpoirier@mplayerhq.hu> | 2008-03-30 10:28:03 +0000 |
| commit | 1a7ee380c55c128507dc165de2094670358396fd (patch) | |
| tree | 4c6b90dbc5c17336fb6146c1bd56b9bf555000c6 | |
| parent | 6e330816d45006d4c1a322b25c2022d1a93c390f (diff) | |
get rid of the useless DCT_ERROR() macro
patch by Alexander Strange %astrange A ithinksw P com%
Originally committed as revision 12627 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/dct-test.c | 39 |
1 files changed, 18 insertions, 21 deletions
diff --git a/libavcodec/dct-test.c b/libavcodec/dct-test.c index dd8099b2e2..7d1a62c301 100644 --- a/libavcodec/dct-test.c +++ b/libavcodec/dct-test.c @@ -82,41 +82,38 @@ struct algo { #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 } |