diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-17 23:04:47 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-17 23:04:47 +0200 |
| commit | c7c33ab721cfafbbe269c8f1505eb2d9a80d7af4 (patch) | |
| tree | 27f85a58ac742deb2c037e05ccbb7ee56b7540ff /configure | |
| parent | 65b0f7ce08170dd2ca2998d42e0bd9f1cb82e76c (diff) | |
| parent | f5ee23004d1177ca6dd99b92cb4ff4b94b2eae09 (diff) | |
Merge commit 'f5ee23004d1177ca6dd99b92cb4ff4b94b2eae09'
* commit 'f5ee23004d1177ca6dd99b92cb4ff4b94b2eae09':
configure: Factor out g722dsp module
Conflicts:
configure
libavcodec/arm/Makefile
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -1903,6 +1903,7 @@ CONFIG_EXTRA=" flacdsp fmtconvert frame_thread_encoder + g722dsp gcrypt gmp golomb @@ -2150,6 +2151,8 @@ ac3_decoder_select="ac3_parser ac3dsp bswapdsp fmtconvert mdct" ac3_fixed_decoder_select="ac3_parser ac3dsp bswapdsp mdct" ac3_encoder_select="ac3dsp audiodsp mdct me_cmp" ac3_fixed_encoder_select="ac3dsp audiodsp mdct me_cmp" +adpcm_g722_decoder_select="g722dsp" +adpcm_g722_encoder_select="g722dsp" aic_decoder_select="golomb idctdsp" alac_encoder_select="lpc" als_decoder_select="bswapdsp" |