[FFmpeg-devel] [PATCH 2/4] compat: use external nvidia headers

Timo Rothenpieler timo at rothenpieler.org
Mon Dec 4 21:41:43 EET 2017


---
 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 <ffnvcodec/dynlink_cuda.h>
+#include <ffnvcodec/dynlink_nvcuvid.h>
+#include <ffnvcodec/nvEncodeAPI.h>
+
 #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 <ffnvcodec/nvEncodeAPI.h>
 
 #include "compat/cuda/dynlink_loader.h"
 #include "libavutil/fifo.h"
-- 
2.15.1



More information about the ffmpeg-devel mailing list