]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit '7b1f9873be2f9d5aea2762c9197ff46df82768dc'
authorJames Almer <jamrial@gmail.com>
Wed, 1 Nov 2017 23:56:07 +0000 (20:56 -0300)
committerJames Almer <jamrial@gmail.com>
Wed, 1 Nov 2017 23:56:07 +0000 (20:56 -0300)
* commit '7b1f9873be2f9d5aea2762c9197ff46df82768dc':
  build: Adjust dependencies for faan(i)dct components

Merged-by: James Almer <jamrial@gmail.com>
1  2 
configure

diff --cc configure
index 1d182d2fa9d0be497c3501cc88686245ff30c96d,4450ce418d112a3262ed4964ec3b215dac1f5c3e..1b0f0646077bb3c5dd6cc7ad46831c6c25633517
+++ b/configure
@@@ -2403,14 -1961,15 +2403,16 @@@ cbs_mpeg2_select="cbs
  dct_select="rdft"
  dirac_parse_select="golomb"
  error_resilience_select="me_cmp"
- faandct_deps="faan fdctdsp"
- faanidct_deps="faan idctdsp"
+ faandct_deps="faan"
+ faandct_select="fdctdsp"
+ faanidct_deps="faan"
+ faanidct_select="idctdsp"
  h264dsp_select="startcode"
 -hevc_ps_select="golomb"
 +hevcparse_select="golomb"
 +frame_thread_encoder_deps="encoders threads"
  intrax8_select="blockdsp idctdsp"
  mdct_select="fft"
 -rdft_select="fft"
 +mdct15_select="fft"
  me_cmp_select="fdctdsp idctdsp pixblockdsp"
  mpeg_er_select="error_resilience"
  mpegaudio_select="mpegaudiodsp mpegaudioheader"