From patchwork Wed Sep 6 09:58:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?Q2zDqW1lbnQgQsWTc2No?= X-Patchwork-Id: 5006 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.15.201 with SMTP id 70csp384565jao; Wed, 6 Sep 2017 02:58:25 -0700 (PDT) X-Google-Smtp-Source: ADKCNb58aG2/cRqBxSfgov3eULxMYfkEhEkOfiSfzb5VyhunXCQOp+TUSqK6tNvzSrb0EcmmJ4QE X-Received: by 10.223.176.213 with SMTP id j21mr1471263wra.56.1504691905040; Wed, 06 Sep 2017 02:58:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504691905; cv=none; d=google.com; s=arc-20160816; b=TG+5vi39LABxHRxQG+jE4Rbz859JoY6MzQhoXXAIxnuKNNGme+RF74AdVFDSMj05OO oO27D+caSCQJS1eTXa6ndLZRFFla/ZbyvSXh1mRaM/gga1ENEmzsPPbZTOiukYpYhfGx gc1Mn93HZTf6YpAkpAnw5SZ8Wfe4QOPvg1RwYrqSvRZwBZEyR0KeNt/hffsqj7J9BTOw mw4t6Xngk+wduwuYEzpPNFpKHaBRvoncOa0mGKmPssydqg73RonwCj7gAWbyyvsuOScJ r8MbNmi1XOUWG+4LBOB0Az6f2BkUtJf31AjTNtjVJ5pmJPgOM0iEn5gTo29C6X7kBnEK fdtg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:domainkey-signature:dkim-signature :delivered-to:arc-authentication-results; bh=FDBrPpkMGSFUSINovvdGqpw2M0mZYHCensqGOkPghGs=; b=k76fPJaxruSrZ0lUbUwYAHQVFgj3kBuHOlRj7dcbyuN9BHJYffBaQwHjSAVL10WRj0 uSTjcFtH9DbH2CSUIkjOKuYyfaTuLX4fZ6QtIPOYIa1Lnja39jN90Bx+6zs2+nTKoDEW PXZsg/WoqHm9/SbnExgZYVyS9QY7VOTYCbZlAgRs8Y9YN6F7G97jnr6QrJ7qT/f0DRfl PlfZ93+D8aeHhz1GUUcv/Qlf7afBwHYSTgSstWIBGA+maHVF158j9inASPsUzl7wvvxe 7gwItZ9KMMcmLlWkrQCl8OB3q0owDdM+sVQX0d6ccRdrLtVA2PXWdaMTq5sX9wuDudsS tKyg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@pkh.me header.s=selector1 header.b=itDL5FBW; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id u84si869737wma.21.2017.09.06.02.58.24; Wed, 06 Sep 2017 02:58:25 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@pkh.me header.s=selector1 header.b=itDL5FBW; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C22DF689A1B; Wed, 6 Sep 2017 12:58:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from golem.pkh.me (LStLambert-657-1-117-164.w92-154.abo.wanadoo.fr [92.154.28.164]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 510766882FA for ; Wed, 6 Sep 2017 12:58:11 +0300 (EEST) Received: from golem.pkh.me (localhost.localdomain [127.0.0.1]) by golem.pkh.me (OpenSMTPD) with ESMTP id f99a6e34; Wed, 6 Sep 2017 09:58:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=pkh.me; h=from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-type:content-transfer-encoding; s=selector1; bh=fGHK99I RIRGWrrF343HrxdqCDRQ=; b=itDL5FBWmXY2EvFi3zstfUUCFehpy8vXwMlOBOz CtpceQEvunYtfBQsI4pN/DZ8JYs3R5vFQUZ4O4Ugfntj6RmNzYy8qU/bfSsmVf2J EKKkwhiS/hPkKDCrd93Kx2BpwYPXbN5ARKDrP3QgqvDANpi4IyNubYf4PXi4A3kw RPS0eUFK3603kNYr/9ucveQ1s1mLKftOXQKvVGw6JAvVJwyVJ2MdLSpHhaQ9AHkZ zQXrMZ/vOHqOwqhSimLR+wboqzWDSL84Pb80kbVY2zcMlmG9GuOijsaBkXa4OUlT uiLv9BMgfIbl5GVsgX8umf+H5ubOG5T+XVcJtQps3WECUnQ== DomainKey-Signature: a=rsa-sha1; c=nofws; d=pkh.me; h=from:to:cc:subject :date:message-id:in-reply-to:references:mime-version :content-type:content-transfer-encoding; q=dns; s=selector1; b=H D4Aq4u9TpsIZwGNkgvyoLtstnbh+nxPJdwDUkvoUgJydFcOzmT9DXmteMJshQO5y bNAepMzMyAt2oE4s7R0Nkmn22KLRBPUBEC3DQdpu5jPGgWU++npGHgpLQgQWW4P5 6LRP5/e2+gGx4PBESvH9XlLl3BSqLxw5eofgecWIRMzb1e0NFMtPkqz5HRC3yX37 ysDPavrMLF7gcVquzoGMIUf+vnKUUCcZmeDpofI46S1HCL74BlIN1FokQXbroxO3 I4UaML+8PQUt9vqEZ+g/besyGBozCov2BjPcBq6b/dP4hu3LmmgvE0LCIQzZ8BHe FX2XsOVGxpDQmHkQx7sUg== Received: from localhost (golem.pkh.me [local]) by golem.pkh.me (OpenSMTPD) with ESMTPA id a92a6a7f; Wed, 6 Sep 2017 09:58:08 +0000 (UTC) From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 6 Sep 2017 11:58:01 +0200 Message-Id: <20170906095806.3070-2-u@pkh.me> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170906095806.3070-1-u@pkh.me> References: <20170906095806.3070-1-u@pkh.me> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/7] lavfi/coreimage: reduce dependency scope from QuartzCore to CoreImage X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Clément Bœsch What is required by the filter is CoreImage, there is no QuartzCore usage. QuartzCore/CoreImage.h is simply an include to CoreImage/CoreImage.h. --- configure | 8 ++++---- libavfilter/vf_coreimage.m | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/configure b/configure index 54fe846fea..442ef606e0 100755 --- a/configure +++ b/configure @@ -5588,8 +5588,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 @@ -5837,8 +5837,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 +#import #import #include "avfilter.h"