From 8c54b7f393c7a18d7404c051529530b6b0bfbf69 Mon Sep 17 00:00:00 2001 From: jp9000 Date: Sun, 23 Jun 2019 20:57:15 -0700 Subject: [PATCH] obs-ffmpeg: Move external headers to external dir Prevents automatic formatting with clang-format --- plugins/obs-ffmpeg/external/.clang-format | 3 +++ plugins/obs-ffmpeg/{ => external}/dynlink_cuda.h | 0 plugins/obs-ffmpeg/{ => external}/nvEncodeAPI.h | 0 plugins/obs-ffmpeg/jim-nvenc.h | 2 +- 4 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 plugins/obs-ffmpeg/external/.clang-format rename plugins/obs-ffmpeg/{ => external}/dynlink_cuda.h (100%) rename plugins/obs-ffmpeg/{ => external}/nvEncodeAPI.h (100%) diff --git a/plugins/obs-ffmpeg/external/.clang-format b/plugins/obs-ffmpeg/external/.clang-format new file mode 100644 index 000000000..6420a4688 --- /dev/null +++ b/plugins/obs-ffmpeg/external/.clang-format @@ -0,0 +1,3 @@ +Language: Cpp +SortIncludes: false +DisableFormat: true diff --git a/plugins/obs-ffmpeg/dynlink_cuda.h b/plugins/obs-ffmpeg/external/dynlink_cuda.h similarity index 100% rename from plugins/obs-ffmpeg/dynlink_cuda.h rename to plugins/obs-ffmpeg/external/dynlink_cuda.h diff --git a/plugins/obs-ffmpeg/nvEncodeAPI.h b/plugins/obs-ffmpeg/external/nvEncodeAPI.h similarity index 100% rename from plugins/obs-ffmpeg/nvEncodeAPI.h rename to plugins/obs-ffmpeg/external/nvEncodeAPI.h diff --git a/plugins/obs-ffmpeg/jim-nvenc.h b/plugins/obs-ffmpeg/jim-nvenc.h index c72376879..00ee54599 100644 --- a/plugins/obs-ffmpeg/jim-nvenc.h +++ b/plugins/obs-ffmpeg/jim-nvenc.h @@ -4,7 +4,7 @@ #include #include -#include "nvEncodeAPI.h" +#include "external/nvEncodeAPI.h" typedef NVENCSTATUS(NVENCAPI *NV_CREATE_INSTANCE_FUNC)( NV_ENCODE_API_FUNCTION_LIST *);