summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClément Bœsch <cboesch@gopro.com>2017-09-05 18:09:37 +0200
committerClément Bœsch <u@pkh.me>2017-09-08 18:55:19 +0200
commitf8519529cfed6453bc7cc7634660021d539049a0 (patch)
tree86c918ec02cae6678febe8e2df9e88eb6a65cc93
parentb476e7720c067d75cd72190db7d36e72c3ff6abb (diff)
lavfi/coreimage: reduce dependency scope from QuartzCore to CoreImage
What is required by the filter is CoreImage, there is no QuartzCore usage. QuartzCore/CoreImage.h is simply an include to CoreImage/CoreImage.h.
-rwxr-xr-xconfigure8
-rw-r--r--libavfilter/vf_coreimage.m2
2 files changed, 5 insertions, 5 deletions
diff --git a/configure b/configure
index 334b597a8b..996cb9f309 100755
--- a/configure
+++ b/configure
@@ -5591,8 +5591,8 @@ frei0r_filter_extralibs='$ldl'
frei0r_src_filter_extralibs='$ldl'
ladspa_filter_extralibs='$ldl'
nvenc_extralibs='$ldl'
-coreimage_filter_extralibs="-framework QuartzCore -framework AppKit -framework OpenGL"
-coreimagesrc_filter_extralibs="-framework QuartzCore -framework AppKit -framework OpenGL"
+coreimage_filter_extralibs="-framework CoreImage -framework AppKit -framework OpenGL"
+coreimagesrc_filter_extralibs="-framework CoreImage -framework AppKit -framework OpenGL"
if ! disabled network; then
check_func getaddrinfo $network_extralibs
@@ -5840,8 +5840,8 @@ enabled cuda_sdk && require cuda_sdk cuda.h cuCtxCreate -lcuda
enabled cuvid && { enabled cuda ||
die "ERROR: CUVID requires CUDA"; }
enabled chromaprint && require chromaprint chromaprint.h chromaprint_get_version -lchromaprint
-enabled coreimage_filter && { check_header_objcc QuartzCore/CoreImage.h || disable coreimage_filter; }
-enabled coreimagesrc_filter && { check_header_objcc QuartzCore/CoreImage.h || disable coreimagesrc_filter; }
+enabled coreimage_filter && { check_header_objcc CoreImage/CoreImage.h || disable coreimage_filter; }
+enabled coreimagesrc_filter && { check_header_objcc CoreImage/CoreImage.h || disable coreimagesrc_filter; }
enabled decklink && { { check_header DeckLinkAPI.h || die "ERROR: DeckLinkAPI.h header not found"; } &&
{ check_cpp_condition DeckLinkAPIVersion.h "BLACKMAGIC_DECKLINK_API_VERSION >= 0x0a060100" || die "ERROR: Decklink API version must be >= 10.6.1."; } }
enabled libndi_newtek && { check_header Processing.NDI.Lib.h || die "ERROR: Processing.NDI.Lib.h header not found"; }
diff --git a/libavfilter/vf_coreimage.m b/libavfilter/vf_coreimage.m
index 9c8db02858..323a28caa1 100644
--- a/libavfilter/vf_coreimage.m
+++ b/libavfilter/vf_coreimage.m
@@ -23,7 +23,7 @@
* Video processing based on Apple's CoreImage API
*/
-#import <QuartzCore/CoreImage.h>
+#import <CoreImage/CoreImage.h>
#import <AppKit/AppKit.h>
#include "avfilter.h"