From 6f58b4dc477e22237c4e89f6e2a1435aaa45a4d3 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Fri, 13 May 2016 09:13:47 +0200 Subject: nvenc: drop the hard dependency on CUDA The code needs only a few definitions from cuda.h, so define them directly when CUDA is not enabled. CUDA is still required for accepting HW frames as input. Based on the code by Timo Rothenpieler . --- libavcodec/nvenc.c | 1 - libavcodec/nvenc.h | 19 ++++++++++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) (limited to 'libavcodec') diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c index 7564985964..bdd26bb0ea 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc.c @@ -21,7 +21,6 @@ #include "config.h" -#include #include #include diff --git a/libavcodec/nvenc.h b/libavcodec/nvenc.h index 8cd5991f4c..e7e6182196 100644 --- a/libavcodec/nvenc.h +++ b/libavcodec/nvenc.h @@ -19,7 +19,6 @@ #ifndef AVCODEC_NVENC_H #define AVCODEC_NVENC_H -#include #include #include "config.h" @@ -29,6 +28,24 @@ #include "avcodec.h" +#if CONFIG_CUDA +#include +#else + +#if defined(_WIN32) +#define CUDAAPI __stdcall +#else +#define CUDAAPI +#endif + +typedef enum cudaError_enum { + CUDA_SUCCESS = 0 +} CUresult; +typedef int CUdevice; +typedef void* CUcontext; +typedef void* CUdeviceptr; +#endif + #define MAX_REGISTERED_FRAMES 64 typedef struct NVENCFrame { -- cgit v1.2.3