From patchwork Mon Dec 4 19:41:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timo Rothenpieler X-Patchwork-Id: 6543 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp4788517jah; Mon, 4 Dec 2017 11:42:00 -0800 (PST) X-Google-Smtp-Source: AGs4zMZIdVkUhHBldhE/U66sq4VihaxZh28UW4MkuzggNT2x+/CvMENVGBEcWoqrnVFbh987PTKZ X-Received: by 10.28.190.17 with SMTP id o17mr3689512wmf.4.1512416520446; Mon, 04 Dec 2017 11:42:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512416520; cv=none; d=google.com; s=arc-20160816; b=eCsI6dYwrCTxvKRpE/O1sJijJ0mOW9CiNK6d+X3rgXXetZCUpnhS/2DIFZl6cW0sTb dSBj5ODLl/ZjnZfil6+XngdY8n5pPExAnVEefTyQ+UCZ4fXAtfCpsg3lnVygeVeTdFZu AMwEuT9ypb0HulHSfI3pZbkqLDMQ60WsWRV56UbCGNonSNo0vZgqghqpBD2BVhu/n+5F JUg8740q1Xo7l0OebdRgNqbmAWn0tcSKrRk72AebqunRuu2p0laY4WKX1BCMK5EYGw+a wfkJahySNT7uM9TTsKMAVOKcYrF0PvvcACQG5BxceEy8BdmhhJkMkYK/I/9fszl4pVV9 HGlg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=HY3NMEFm0Wr+JqgxBpq0hSHKUY7rLcfkkYsUOJ7fncg=; b=VnxLZgGDZ8Xc3IlTeMIralNwigUUVebhEiRiS1FVaUf4Hp2feCEiBudhGmZy/aptto Ly7l5b5e/08xZNWzlXvRW/x85fpf4EW4QpB6I2yfdA8k6XQlmJIad6Ma0ijvhSnsaAkB dmhlQ+wZj0JJfcEocKo5JTQZG+pCFA5AN86VSYNYzcRbsEzJ5UcG466b1rXv2by7Az1L fuYzeZbd76c3RWy1fXPFkDFpNkACCdu3TazkjtK/Wo5aMwKCazGSMu438J4KSvMhqzeJ e+9LPAloQsjGeQM5x+/bUV0YbNJkzQQ1fOXPy4QALQS0Ucpe1hwlc1C/KwdJxlp4dLdc KasQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@rothenpieler.org header.s=mail header.b=FfFjITvl; 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 p27si5548106wmf.185.2017.12.04.11.41.59; Mon, 04 Dec 2017 11:42:00 -0800 (PST) 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=@rothenpieler.org header.s=mail header.b=FfFjITvl; 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 33E2368A3D5; Mon, 4 Dec 2017 21:41:53 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from btbn.de (btbn.de [5.9.118.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A93F768A356 for ; Mon, 4 Dec 2017 21:41:46 +0200 (EET) Received: from localhost.localdomain (unknown [IPv6:2a02:8109:1600:48e0:ba97:5aff:fe10:ec69]) by btbn.de (Postfix) with ESMTPSA id 1683C11A055; Mon, 4 Dec 2017 20:41:51 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=rothenpieler.org; s=mail; t=1512416511; bh=JtLOVzgZUqKUuuWppWjrs/E7kc83W6KD2a3a8L+Kp8U=; h=From:To:Cc:Subject:Date; b=FfFjITvl+Pl0SOvlV3mdKfR/4XuZKtBY2IOCmPrYi8wHpoYjgM8+cxd9jr3zZl44b WHq6nFoYTgPuq7dVDgWUjKSA5oOKqaaDkVCRsDIDbFdcpnk3sPrh/96cjFMkhvosDn ZUy3AAt+4sYy0VrNqynI4443j/0S0ulo0qx6mcxA= From: Timo Rothenpieler To: ffmpeg-devel@ffmpeg.org Date: Mon, 4 Dec 2017 20:41:42 +0100 Message-Id: <20171204194145.20754-1-timo@rothenpieler.org> X-Mailer: git-send-email 2.15.1 Subject: [FFmpeg-devel] [PATCH 1/4] configure: require external ffnvcodec headers 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: Timo Rothenpieler MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" The external headers can be found at https://git.videolan.org/?p=ffmpeg/nv-codec-headers.git --- configure | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/configure b/configure index d05388638d..b4d82f1df6 100755 --- a/configure +++ b/configure @@ -2662,6 +2662,7 @@ zmbv_encoder_deps="zlib" # hardware accelerators crystalhd_deps="libcrystalhd_libcrystalhd_if_h" +cuda_deps="ffnvcodec" cuda_deps_any="libdl LoadLibrary" cuvid_deps="cuda" d3d11va_deps="dxva_h ID3D11VideoDecoder ID3D11VideoContext" @@ -5743,6 +5744,9 @@ check_type "va/va.h va/va_enc_vp9.h" "VAEncPictureParameterBufferVP9" check_type "vdpau/vdpau.h" "VdpPictureInfoHEVC" +check_pkg_config ffnvcodec "ffnvcodec >= 8.0" \ + "ffnvcodec/nvEncodeAPI.h ffnvcodec/dynlink_cuda.h ffnvcodec/dynlink_cuviddec.h ffnvcodec/dynlink_nvcuvid.h" "" + check_cpp_condition windows.h "!WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)" && enable winrt || disable winrt if ! disabled w32threads && ! enabled pthreads; then @@ -6196,7 +6200,7 @@ fi enabled nvenc && check_cc -I$source_path < NV_ENCODE_API_FUNCTION_LIST flist; void f(void) { struct { const GUID guid; } s[] = { { NV_ENC_PRESET_HQ_GUID } }; } int main(void) { return 0; }