[FFmpeg-cvslog] Merge commit '7b1f9873be2f9d5aea2762c9197ff46df82768dc'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Wed Nov  1 20:56:07 2017 -0300| [7e5ebd0009a2c2f53b68713d55c3cd03ba5f48c1] | committer: James Almer

Merge commit '7b1f9873be2f9d5aea2762c9197ff46df82768dc'

* commit '7b1f9873be2f9d5aea2762c9197ff46df82768dc':
  build: Adjust dependencies for faan(i)dct components

Merged-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7e5ebd0009a2c2f53b68713d55c3cd03ba5f48c1
---

 configure | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index 1d182d2fa9..1b0f064607 100755
--- a/configure
+++ b/configure
@@ -2403,8 +2403,10 @@ 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"
 hevcparse_select="golomb"
 frame_thread_encoder_deps="encoders threads"


======================================================================

diff --cc configure
index 1d182d2fa9,4450ce418d..1b0f064607
--- a/configure
+++ 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"