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/fdctdsp.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/fdctdsp.c')
| -rw-r--r-- | libavcodec/fdctdsp.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/fdctdsp.c b/libavcodec/fdctdsp.c index 80acca333d..c4b7358caf 100644 --- a/libavcodec/fdctdsp.c +++ b/libavcodec/fdctdsp.c @@ -33,9 +33,11 @@ av_cold void ff_fdctdsp_init(FDCTDSPContext *c, AVCodecContext *avctx) } else if (avctx->dct_algo == FF_DCT_FASTINT) { c->fdct = ff_fdct_ifast; c->fdct248 = ff_fdct_ifast248; +#if CONFIG_FAANDCT } else if (avctx->dct_algo == FF_DCT_FAAN) { c->fdct = ff_faandct; c->fdct248 = ff_faandct248; +#endif /* CONFIG_FAANDCT */ } else { c->fdct = ff_jpeg_fdct_islow_8; // slow/accurate/default c->fdct248 = ff_fdct248_islow_8; |