aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2018-03-07 13:27:39 +0100
committerDiego Biurrun <diego@biurrun.de>2018-03-07 13:53:27 +0100
commit121314895f6360852b2807d5dfafea576b2e6fed (patch)
treea65a5ff9135917a29fd893928b4bc5e42259eaac
parent0711d142997b2662ba9198e607015b06c6eed0d8 (diff)
downloadffmpeg-121314895f6360852b2807d5dfafea576b2e6fed.tar.gz
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.
-rwxr-xr-xconfigure6
1 files changed, 1 insertions, 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