diff options
author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-17 22:42:14 +0300 |
---|---|---|
committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-17 22:42:14 +0300 |
commit | 948a15195c69da2ff9a4b0ac7df782ba1cc2795f (patch) | |
tree | 9a461846aa7ce2427422a684bce93ea34c5db653 /configure | |
parent | fd280de7eeb8657c406e89dd4c84b5ffab9c0508 (diff) | |
parent | b075869bc1e1aadea0a8dc819ebfb758adb9e3d0 (diff) |
Merge commit 'b075869bc1e1aadea0a8dc819ebfb758adb9e3d0'
* commit 'b075869bc1e1aadea0a8dc819ebfb758adb9e3d0':
configure: Factor out flacdsp module
Conflicts:
configure
libavcodec/Makefile
libavcodec/arm/Makefile
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -1900,6 +1900,7 @@ CONFIG_EXTRA=" faandct faanidct fdctdsp + flacdsp fmtconvert frame_thread_encoder gcrypt @@ -2189,8 +2190,8 @@ ffv1_encoder_select="rangecoder" ffvhuff_decoder_select="huffyuv_decoder" ffvhuff_encoder_select="huffyuv_encoder" fic_decoder_select="golomb" -flac_decoder_select="golomb" -flac_encoder_select="bswapdsp golomb lpc" +flac_decoder_select="flacdsp golomb" +flac_encoder_select="bswapdsp flacdsp golomb lpc" flashsv_decoder_select="zlib" flashsv_encoder_select="zlib" flashsv2_encoder_select="zlib" |