diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-10 02:56:05 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-10 03:22:14 +0400 |
| commit | 2d5e9451de3c7ab00cac6ec4aff290e12a2f190d (patch) | |
| tree | 9934a09e3ad1f63796274ee59f216df19cd9ca02 /configure | |
| parent | 6cc1fec41263add956b35af96d7c4a81c9436a65 (diff) | |
| parent | f46bb608d9d76c543e4929dc8cffe36b84bd789e (diff) | |
Merge commit 'f46bb608d9d76c543e4929dc8cffe36b84bd789e'
* commit 'f46bb608d9d76c543e4929dc8cffe36b84bd789e':
dsputil: Split off pixel block routines into their own context
Conflicts:
configure
libavcodec/dsputil.c
libavcodec/mpegvideo_enc.c
libavcodec/pixblockdsp_template.c
libavcodec/x86/dsputilenc.asm
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
@@ -1829,6 +1829,7 @@ CONFIG_EXTRA=" mpegvideo mpegvideoenc nettle + pixblockdsp qpeldsp rangecoder riffdec @@ -1997,7 +1998,7 @@ threads_if_any="$THREADS_LIST" # subsystems dct_select="rdft" -dsputil_select="fdctdsp idctdsp" +dsputil_select="fdctdsp idctdsp pixblockdsp" error_resilience_select="dsputil" frame_thread_encoder_deps="encoders threads" intrax8_select="error_resilience" @@ -2007,7 +2008,7 @@ mpeg_er_select="error_resilience" mpegaudio_select="mpegaudiodsp" mpegaudiodsp_select="dct" mpegvideo_select="blockdsp dsputil h264chroma hpeldsp idctdsp videodsp" -mpegvideoenc_select="dsputil mpegvideo qpeldsp" +mpegvideoenc_select="dsputil mpegvideo pixblockdsp qpeldsp" # decoders / encoders aac_decoder_select="mdct sinewin" @@ -2026,9 +2027,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 fdctdsp" +asv1_encoder_select="bswapdsp fdctdsp pixblockdsp" asv2_decoder_select="blockdsp bswapdsp idctdsp" -asv2_encoder_select="bswapdsp dsputil fdctdsp" +asv2_encoder_select="bswapdsp fdctdsp pixblockdsp" atrac1_decoder_select="mdct sinewin" atrac3_decoder_select="mdct" atrac3p_decoder_select="mdct sinewin" @@ -2045,9 +2046,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 fdctdsp idctdsp mpegvideoenc" +dnxhd_encoder_select="aandcttables blockdsp fdctdsp idctdsp mpegvideoenc pixblockdsp" dvvideo_decoder_select="dvprofile idctdsp" -dvvideo_encoder_select="dsputil dvprofile fdctdsp" +dvvideo_encoder_select="dsputil dvprofile fdctdsp pixblockdsp" dxa_decoder_select="zlib" eac3_decoder_select="ac3_decoder" eac3_encoder_select="ac3_encoder" |