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/idctdsp.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/idctdsp.c')
| -rw-r--r-- | libavcodec/idctdsp.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/idctdsp.c b/libavcodec/idctdsp.c index 19e8126261..75695ef437 100644 --- a/libavcodec/idctdsp.c +++ b/libavcodec/idctdsp.c @@ -274,11 +274,13 @@ av_cold void ff_idctdsp_init(IDCTDSPContext *c, AVCodecContext *avctx) c->idct_add = ff_jref_idct_add; c->idct = ff_j_rev_dct; c->perm_type = FF_IDCT_PERM_LIBMPEG2; +#if CONFIG_FAANIDCT } else if (avctx->idct_algo == FF_IDCT_FAAN) { c->idct_put = ff_faanidct_put; c->idct_add = ff_faanidct_add; c->idct = ff_faanidct; c->perm_type = FF_IDCT_PERM_NONE; +#endif /* CONFIG_FAANIDCT */ } else { // accurate/default c->idct_put = ff_simple_idct_put_8; c->idct_add = ff_simple_idct_add_8; |