simple_idct: Template functions to support an input bitdepth parameter

[ffmpeg] / libavcodec / nvenc.h

diff --git a/libavcodec/nvenc.h b/libavcodec/nvenc.h
index 2e51f1e946f4b74e169fb3895bc826134fe43b6a..bff25dfc3ca121006e58ca78eb0a677d00ae89a6 100644 (file)
--- 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"
@@ -44,7 +44,6 @@ typedef struct NvencSurface
 {
     NV_ENC_INPUT_PTR input_surface;
     AVFrame *in_ref;
-    NV_ENC_MAP_INPUT_RESOURCE in_map;
     int reg_idx;
     int width;
     int height;
@@ -131,6 +130,7 @@ typedef struct NvencContext
         int ptr_index;
         NV_ENC_REGISTERED_PTR regptr;
         int mapped;
+        NV_ENC_MAP_INPUT_RESOURCE in_map;
     } registered_frames[MAX_REGISTERED_FRAMES];
     int nb_registered_frames;