From patchwork Tue Sep 5 16:09:44 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: 4996 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.15.201 with SMTP id 70csp4279329jao; Tue, 5 Sep 2017 09:10:21 -0700 (PDT) X-Google-Smtp-Source: ADKCNb6h290O87djLU2a2jh1bNSHq8j7LEuRalS4EQZ57o+y/OSeifBZ+DmASewraBvoKTM7IAEL X-Received: by 10.28.134.209 with SMTP id i200mr2908538wmd.118.1504627813389; Tue, 05 Sep 2017 09:10:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504627813; cv=none; d=google.com; s=arc-20160816; b=vpSIa0zYyjldR+t9FUq6Cnt91v9VPrFE1EQRtRzW2pEj2ogdehVohGEhKhWDic5Fex GUJzzvzRsOyi8FZjrLK1gkcyWpltUDqi1dC+raVQS2AGdQmSg5y+t92RLJ45H3FEYo8G 30uwg+B2dL1WlrkKd/qHuMBuos2f4QeUDnQolsjCAlAGH9wGLyTphHij62psCx50S3bZ 3SR3txU6nvqmXWutU/nGwZsRAGmyhx3Vzes6Bc19Yet3h1u1aSkkorX1jxz2HOesKWsp UGI/2gGBgDeUd0X8qszWenBg48eVYIO5mUlqvvlyD6eYBEmSn11tf4J7NW2Ow3wz4le9 w9QQ== 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=ms1W7yS8QM+Xbr90jzJ/rZNZUaEP+qJCk7n1fMpBwA3pKQrVPF6EkDXQtTNF9Slq04 u+pnJTmZJ76RVJn101UCTsNVJcFLL2eHX1dlSq+SZilkLqxAuj2KXFz/9Qw2Jex9zniU AL8V6wYDIn6108Tg/gEwbwa7P9tP3wXyp3Cv06rcl/UG7zT8AcpKGAUbAl7ifqiPnC70 JQrop5/JkiKdS9UPuLgN04JX9tCMcQQluNzsX/P2uO39+C188wv01QqvDZrj9crH2kHN mhpHObd1Xk3yApqDC52u0r3azKkfPJ4NPtQqPCHrf22NBzyqI/1pCuLbjEJ3zo4bDQEo VWCQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@pkh.me header.s=selector1 header.b=pouTHx/H; 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 b3si573425wrh.535.2017.09.05.09.10.05; Tue, 05 Sep 2017 09:10:13 -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=pouTHx/H; 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 40952689DCA; Tue, 5 Sep 2017 19:09:57 +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 9F75B68065E for ; Tue, 5 Sep 2017 19:09:50 +0300 (EEST) Received: from golem.pkh.me (localhost.localdomain [127.0.0.1]) by golem.pkh.me (OpenSMTPD) with ESMTP id 166b03b8; Tue, 5 Sep 2017 16:09:47 +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=pouTHx/H78sTCgFmXSd+xewcG0qqr/ilfXTdOlD YGbiM+yJ1h1ypslV3SRBdHFg2r9KdcQFsqgBIscE/6KFr2HdaKFon1DEDVISIZV+ YEvf0euya9pQLHvCjbt4yj0Mp6/6sd/NU+r0IBlI4APP3QoSWfN92k/WJt08MYua DV0wz3gc3pEGllI7KdTFsj8SoWG9R8W7sqoOGJW2cjnIENUmKT3HIdSzcdrPOl/u M2TTSGiD8UDl6YGRoCBbK/Mff+6GjvC9NKHiq/vSNZlsZQMOPUYZU0URgXI5jB/Q z5LsDWr5mo9VpkgvJTCwyJaKCGHuPsiml8hNKDhDCrLsM5w== 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=f dpwWhcFvOrLwKHOZLFqszX4t/ElJdsZRBUOqwjOvSy02DaJVi7r5xhe8podIfvAo nYZad4GSZn3ngNaDNV8EYTx2dBYYolRc/7Ic2LcTgxX8kpzPddPAp2UMolnAxh7p zVWd+i/66XG/sIjuwOwrIb0FyxPqdN6LMylxyKVGrczNhq3VV86TrzKP0WpNL12u 5iV0iUEG70rUXUevSiDYyval8Ru4NXed0gqI4LJ56Naj93nbXPpgebETgoqcBw9E 4niZ1fv/Gz9XbfPbeP81wYJ+CIfgVJ60wDkxCVacYfqrkRTP+BOgIiYoK4NrxK9b 4ajlIG3MlXG0QXK64hsVg== Received: from localhost (golem.pkh.me [local]) by golem.pkh.me (OpenSMTPD) with ESMTPA id 0c928b4d; Tue, 5 Sep 2017 16:09:47 +0000 (UTC) From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= To: ffmpeg-devel@ffmpeg.org Date: Tue, 5 Sep 2017 18:09:44 +0200 Message-Id: <20170905160944.1429-2-u@pkh.me> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170905160944.1429-1-u@pkh.me> References: <20170905160944.1429-1-u@pkh.me> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] 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"