[FFmpeg-cvslog] lavfi/coreimage: reduce dependency scope from QuartzCore to CoreImage
Clément Bœsch
git at videolan.org
Fri Sep 8 19:58:46 EEST 2017
ffmpeg | branch: master | Clément Bœsch <cboesch at gopro.com> | Tue Sep 5 18:09:37 2017 +0200| [f8519529cfed6453bc7cc7634660021d539049a0] | committer: Clément Bœsch
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.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f8519529cfed6453bc7cc7634660021d539049a0
---
configure | 8 ++++----
libavfilter/vf_coreimage.m | 2 +-
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"
More information about the ffmpeg-cvslog
mailing list