diff options
author | Diego Biurrun <diego@biurrun.de> | 2014-08-28 19:32:45 -0700 |
---|---|---|
committer | Diego Biurrun <diego@biurrun.de> | 2014-09-07 13:36:26 -0700 |
commit | 1274ea8dbaec44355bde07f6bb31fec0c4e6fd2d (patch) | |
tree | c517d38cce7cf1e78e232c114ebe63f0429cd873 /libavcodec/mpegvideo_enc.c | |
parent | fcf597625c7a991ca389f3a9b8ff4f5e383301c0 (diff) | |
download | ffmpeg-streaming-1274ea8dbaec44355bde07f6bb31fec0c4e6fd2d.zip ffmpeg-streaming-1274ea8dbaec44355bde07f6bb31fec0c4e6fd2d.tar.gz |
Split off floating point AAN (I)DCT into separate components
Diffstat (limited to 'libavcodec/mpegvideo_enc.c')
-rw-r--r-- | libavcodec/mpegvideo_enc.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 380eff6..17322e5 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -89,8 +89,10 @@ void ff_convert_matrix(MpegEncContext *s, int (*qmat)[64], for (qscale = qmin; qscale <= qmax; qscale++) { int i; if (fdsp->fdct == ff_jpeg_fdct_islow_8 || - fdsp->fdct == ff_jpeg_fdct_islow_10 || - fdsp->fdct == ff_faandct) { +#if CONFIG_FAANDCT + fdsp->fdct == ff_faandct || +#endif /* CONFIG_FAANDCT */ + fdsp->fdct == ff_jpeg_fdct_islow_10) { for (i = 0; i < 64; i++) { const int j = s->idsp.idct_permutation[i]; /* 16 <= qscale * quant_matrix[i] <= 7905 |