[FFmpeg-cvslog] configure: Fix logic of AMF external library check

Diego Biurrun git at videolan.org
Thu Mar 15 23:02:22 EET 2018


ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Wed Mar  7 13:27:39 2018 +0100| [121314895f6360852b2807d5dfafea576b2e6fed] | committer: Diego Biurrun

configure: Fix logic of AMF external library check

Fail if AMF is requested but unavailable, as we do for all
other external libraries that need to be explicitly enabled.

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

 configure | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/configure b/configure
index 1c35f9dc64..d882d4c73f 100755
--- a/configure
+++ b/configure
@@ -4598,11 +4598,7 @@ for func in $MATH_FUNCS; do
 done
 
 # these are off by default, so fail if requested and not available
-
-enabled amf &&
-    check_cpp_condition "AMF/core/Version.h" \
-        "(AMF_VERSION_MAJOR << 48 | AMF_VERSION_MINOR << 32 | AMF_VERSION_RELEASE << 16 | AMF_VERSION_BUILD_NUM) >= 0x0001000400040001" ||
-    disable amf
+enabled amf               && require_cpp_condition AMF/core/Version.h "(AMF_VERSION_MAJOR << 48 | AMF_VERSION_MINOR << 32 | AMF_VERSION_RELEASE << 16 | AMF_VERSION_BUILD_NUM) >= 0x0001000400040001"
 enabled avisynth          && require_header avisynth/avisynth_c.h
 enabled avxsynth          && require_header avxsynth/avxsynth_c.h
 enabled cuda              && require cuda cuda.h cuInit -lcuda



More information about the ffmpeg-cvslog mailing list