From patchwork Mon Dec 4 19:41:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timo Rothenpieler X-Patchwork-Id: 6544 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp4788628jah; Mon, 4 Dec 2017 11:42:08 -0800 (PST) X-Google-Smtp-Source: AGs4zMY2sSSq8XLwTBTtDH4/AwiiFxx5RE417HtU9glb7GL/XL2v85y2Qxx2FSquVEnLbbWa3s7C X-Received: by 10.28.140.211 with SMTP id o202mr3743312wmd.145.1512416528106; Mon, 04 Dec 2017 11:42:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512416528; cv=none; d=google.com; s=arc-20160816; b=A/mJP6E+gswl+s5G+Wju3Zfx0s8sPQcQ1GWQ2tEm/QIQvlw9C4H0dZQg41z8Ra9zZr MQAlegRKmhHt/GBE/F8gVdb4HNeoJzeoj2sM4HYqmdSN1Tf4YGbYDLe85qzsNnE3ljaL NGrTlxIjoUR3XL1QBH4TCGGMs2usykZS0xIg+U4Ty9F4glyUqGsWHysqGTqX0VTyaS+/ 4lw6BgOsmTcd78Rcq6n5JltDngLb0ccgNYjOOqk+w1jnj2PDveLUQDGpUklbs8V3M6yA 4iUv/igv7jzxRBzQAOh07ddRAx4RGQbcuHQOsb5UcMNqbUxKGg5V+Zd5AL6AxQrTplfI rQEw== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=xJqh/11NGaL8a884DTNvw1XADkSE5XCNBUIJHs/rohc=; b=qlc2pptBPYb78+Sks0Y3/Amek7cpvJoWDxfQH1qsrfzoHVee+6+Uoh8Q0SOU2RKPn6 8SZqNcVj0e/G+nZnxP6Bf/Bo4YY8+G1w1yQfgK3LtORwkYf/q5j+FdC63CH8aWV0riH7 LNNfdTLewBdmONyHLDtsFSrQZn0mnawwkJ2UVqjC7hiGfyGltlx0TsesxkeQ3I9hxrSE 9PQIVKxG5M+qcEvp1NTQJNMTylgQPS2ypKZHQT+n2NE9/tAUhbH9io9mpGFADPkEZdBM BtRAIp8JRZmLki84mOtj11fYmupkBH2RA0sIP60FnZztPqRiutzeQCrSUhb96ppyEOXk z1hQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@rothenpieler.org header.s=mail header.b=hCu0BLeu; 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 r185si5482147wma.256.2017.12.04.11.42.07; Mon, 04 Dec 2017 11:42:08 -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=hCu0BLeu; 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 934E168A42D; 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 ACA7C68A389 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 4815F11A0D9; 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=1AdTH4uGQgbZ79lbQ6koiftEfloAsERTFBn1j36r2Gk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=hCu0BLeuI1tRfUNUbnAV29JB3IvENuUm7uYgU9jtpPplkfbprK+vMifuRLi4n3wis F05pfnrdKMj59M/X4wXqP288N/WIiACBRls/Yj3GUBycgYN10gDO+t1FiCjnNMLQoT YtTErViea1cT8yiXNamnznYcQkFoeUJxLZSpspy0= From: Timo Rothenpieler To: ffmpeg-devel@ffmpeg.org Date: Mon, 4 Dec 2017 20:41:43 +0100 Message-Id: <20171204194145.20754-2-timo@rothenpieler.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20171204194145.20754-1-timo@rothenpieler.org> References: <20171204194145.20754-1-timo@rothenpieler.org> Subject: [FFmpeg-devel] [PATCH 2/4] compat: use external nvidia 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" --- compat/cuda/dynlink_loader.h | 7 ++++--- libavcodec/nvenc.h | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/compat/cuda/dynlink_loader.h b/compat/cuda/dynlink_loader.h index fa43782c9a..6e2a912a6e 100644 --- a/compat/cuda/dynlink_loader.h +++ b/compat/cuda/dynlink_loader.h @@ -28,9 +28,10 @@ #ifndef AV_COMPAT_CUDA_DYNLINK_LOADER_H #define AV_COMPAT_CUDA_DYNLINK_LOADER_H -#include "compat/cuda/dynlink_cuda.h" -#include "compat/cuda/dynlink_nvcuvid.h" -#include "compat/nvenc/nvEncodeAPI.h" +#include +#include +#include + #include "compat/w32dlfcn.h" #include "libavutil/log.h" diff --git a/libavcodec/nvenc.h b/libavcodec/nvenc.h index 2e51f1e946..b6279ff44c 100644 --- a/libavcodec/nvenc.h +++ b/libavcodec/nvenc.h @@ -28,7 +28,7 @@ typedef void ID3D11Device; #endif -#include "compat/nvenc/nvEncodeAPI.h" +#include #include "compat/cuda/dynlink_loader.h" #include "libavutil/fifo.h"