diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-08 00:54:55 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-08 00:54:55 +0200 |
| commit | f044fc03727dcbe7535b393e06d8ab1bc0312a9c (patch) | |
| tree | a45d030361c42e9c650f4c2544f6307625ad04ec /libavcodec/dct-test.c | |
| parent | 1a59a288380ab208914c5e8d94f688a6f75954ae (diff) | |
| parent | 1274ea8dbaec44355bde07f6bb31fec0c4e6fd2d (diff) | |
| download | ffmpeg-f044fc03727dcbe7535b393e06d8ab1bc0312a9c.tar.gz | |
Merge commit '1274ea8dbaec44355bde07f6bb31fec0c4e6fd2d'
* commit '1274ea8dbaec44355bde07f6bb31fec0c4e6fd2d':
Split off floating point AAN (I)DCT into separate components
Conflicts:
configure
libavcodec/Makefile
libavcodec/dct-test.c
libavcodec/idctdsp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dct-test.c')
| -rw-r--r-- | libavcodec/dct-test.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libavcodec/dct-test.c b/libavcodec/dct-test.c index f4f8abd309..1739c37bee 100644 --- a/libavcodec/dct-test.c +++ b/libavcodec/dct-test.c @@ -58,9 +58,11 @@ struct algo { static const struct algo fdct_tab[] = { { "REF-DBL", ff_ref_fdct, FF_IDCT_PERM_NONE }, - { "FAAN", ff_faandct, FF_IDCT_PERM_NONE }, { "IJG-AAN-INT", ff_fdct_ifast, FF_IDCT_PERM_NONE }, { "IJG-LLM-INT", ff_jpeg_fdct_islow_8, FF_IDCT_PERM_NONE }, +#if CONFIG_FAANDCT + { "FAAN", ff_faandct, FF_IDCT_PERM_NONE }, +#endif /* CONFIG_FAANDCT */ }; static void ff_prores_idct_wrap(int16_t *dst){ @@ -77,11 +79,13 @@ static void ff_prores_idct_wrap(int16_t *dst){ } static const struct algo idct_tab[] = { - { "FAANI", ff_faanidct, FF_IDCT_PERM_NONE }, { "REF-DBL", ff_ref_idct, FF_IDCT_PERM_NONE }, { "INT", ff_j_rev_dct, FF_IDCT_PERM_LIBMPEG2 }, { "SIMPLE-C", ff_simple_idct_8, FF_IDCT_PERM_NONE }, { "PR-C", ff_prores_idct_wrap, FF_IDCT_PERM_NONE, 0, 1 }, +#if CONFIG_FAANIDCT + { "FAANI", ff_faanidct, FF_IDCT_PERM_NONE }, +#endif /* CONFIG_FAANIDCT */ #if CONFIG_MPEG4_DECODER { "XVID", ff_xvid_idct, FF_IDCT_PERM_NONE, 0, 1 }, #endif /* CONFIG_MPEG4_DECODER */ |