diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-03 03:55:23 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-03 04:09:38 +0200 |
| commit | 5b58d79a99658200ee5562999b16b5a8fa729b22 (patch) | |
| tree | bd10ed2708d7485f5156c4e67f8325bcff5bd999 /libavcodec/dct-test.c | |
| parent | 5db23c07a3f76d31e8e3178f8bacb68289bba62b (diff) | |
| parent | 7a1d6ddd2c6b2d66fbc1afa584cf506930a26453 (diff) | |
Merge commit '7a1d6ddd2c6b2d66fbc1afa584cf506930a26453'
* commit '7a1d6ddd2c6b2d66fbc1afa584cf506930a26453':
xvid: Add C IDCT
Conflicts:
libavcodec/dct-test.c
libavcodec/xvididct.c
See: 298b3b6c1f8f66b9bc6de53a7b51d3de745d946b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dct-test.c')
| -rw-r--r-- | libavcodec/dct-test.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/dct-test.c b/libavcodec/dct-test.c index bc6b07744a..f4f8abd309 100644 --- a/libavcodec/dct-test.c +++ b/libavcodec/dct-test.c @@ -42,6 +42,7 @@ #include "dct.h" #include "idctdsp.h" #include "simple_idct.h" +#include "xvididct.h" #include "aandcttab.h" #include "faandct.h" #include "faanidct.h" @@ -81,6 +82,9 @@ static const struct algo idct_tab[] = { { "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_MPEG4_DECODER + { "XVID", ff_xvid_idct, FF_IDCT_PERM_NONE, 0, 1 }, +#endif /* CONFIG_MPEG4_DECODER */ }; #if ARCH_ARM |