diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-08 03:12:10 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-08 03:19:06 +0200 |
| commit | 14e2406de7d211d50fcce0059c90103bdaa947aa (patch) | |
| tree | 10e20cd60b4f4bc91d14957b9565871cdd0381c3 /configure | |
| parent | 5c7bf354dc0c8bea6e7af21c0bc2edad92974274 (diff) | |
| parent | a9aee08d900f686e966c64afec5d88a7d9d130a3 (diff) | |
Merge commit 'a9aee08d900f686e966c64afec5d88a7d9d130a3'
* commit 'a9aee08d900f686e966c64afec5d88a7d9d130a3':
dsputil: Split off FDCT bits into their own context
Conflicts:
configure
libavcodec/Makefile
libavcodec/asvenc.c
libavcodec/dnxhdenc.c
libavcodec/dsputil.c
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c
libavcodec/x86/Makefile
libavcodec/x86/dsputilenc_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 13 |
1 files changed, 7 insertions, 6 deletions
@@ -1802,6 +1802,7 @@ CONFIG_EXTRA=" cabac dsputil exif + fdctdsp frame_thread_encoder gcrypt golomb @@ -1995,7 +1996,7 @@ threads_if_any="$THREADS_LIST" # subsystems dct_select="rdft" -dsputil_select="idctdsp" +dsputil_select="fdctdsp idctdsp" error_resilience_select="dsputil" frame_thread_encoder_deps="encoders threads" intrax8_select="error_resilience" @@ -2024,9 +2025,9 @@ amv_decoder_select="sp5x_decoder exif" amv_encoder_select="aandcttables mpegvideoenc" ape_decoder_select="bswapdsp llauddsp" asv1_decoder_select="blockdsp bswapdsp idctdsp" -asv1_encoder_select="bswapdsp dsputil" +asv1_encoder_select="bswapdsp dsputil fdctdsp" asv2_decoder_select="blockdsp bswapdsp idctdsp" -asv2_encoder_select="bswapdsp dsputil" +asv2_encoder_select="bswapdsp dsputil fdctdsp" atrac1_decoder_select="mdct sinewin" atrac3_decoder_select="mdct" atrac3p_decoder_select="mdct sinewin" @@ -2043,9 +2044,9 @@ cscd_decoder_suggest="zlib" dca_decoder_select="mdct" dirac_decoder_select="dsputil dwt golomb videodsp" dnxhd_decoder_select="blockdsp idctdsp" -dnxhd_encoder_select="aandcttables blockdsp dsputil idctdsp mpegvideoenc" +dnxhd_encoder_select="aandcttables blockdsp dsputil fdctdsp idctdsp mpegvideoenc" dvvideo_decoder_select="idctdsp" -dvvideo_encoder_select="dsputil" +dvvideo_encoder_select="dsputil fdctdsp" dxa_decoder_select="zlib" eac3_decoder_select="ac3_decoder" eac3_encoder_select="ac3_encoder" @@ -2134,7 +2135,7 @@ opus_decoder_deps="swresample" png_decoder_select="zlib" png_encoder_select="huffyuvencdsp zlib" prores_decoder_select="blockdsp idctdsp" -prores_encoder_select="dsputil" +prores_encoder_select="fdctdsp" qcelp_decoder_select="lsp" qdm2_decoder_select="mdct rdft mpegaudiodsp" ra_144_encoder_select="audio_frame_queue lpc audiodsp" |