projects: Update for recent upstream merge.

e9f506fc · Matt Oliver · 31b0e52c · e9f506fc · e9f506fc · e9f506fc
10 changed file
--- a/SMP/config.asm
+++ b/SMP/config.asm
@@ -244,6 +244,7 @@
 %define HAVE_DIRECT_H 1
 %define HAVE_DIRENT_H 0
 %define HAVE_DLFCN_H 0
+%define HAVE_DXGIDEBUG_H 1
 %define HAVE_DXVA_H 1
 %define HAVE_ES2_GL_H 0
 %define HAVE_GSM_H 0
@@ -405,8 +406,6 @@
 %define HAVE_ALSA 0
 %define HAVE_ATOMICS_NATIVE 1
 %define HAVE_DOS_PATHS 1
-%define HAVE_DXVA2_LIB 1
-%define HAVE_DXVA2API_COBJ 1
 %define HAVE_JACK 0
 %define HAVE_LIBC_MSVCRT 1
 %define HAVE_MAKEINFO 0
@@ -1964,6 +1963,7 @@
 %define CONFIG_CELLAUTO_FILTER 1
 %define CONFIG_COLOR_FILTER 1
 %define CONFIG_COREIMAGESRC_FILTER 0
+%define CONFIG_FREI0R_SRC_FILTER 0
 %define CONFIG_HALDCLUTSRC_FILTER 1
 %define CONFIG_LIFE_FILTER 1
 %define CONFIG_MANDELBROT_FILTER 1
@@ -1996,6 +1996,7 @@
 %define CONFIG_H263_VIDEOTOOLBOX_HWACCEL 0
 %define CONFIG_H264_CUVID_HWACCEL 1
 %define CONFIG_H264_D3D11VA_HWACCEL 1
+%define CONFIG_H264_D3D11VA2_HWACCEL 1
 %define CONFIG_H264_DXVA2_HWACCEL 1
 %define CONFIG_H264_MEDIACODEC_HWACCEL 0
 %define CONFIG_H264_MMAL_HWACCEL 0
@@ -2007,6 +2008,7 @@
 %define CONFIG_H264_VIDEOTOOLBOX_HWACCEL 0
 %define CONFIG_HEVC_CUVID_HWACCEL 1
 %define CONFIG_HEVC_D3D11VA_HWACCEL 1
+%define CONFIG_HEVC_D3D11VA2_HWACCEL 1
 %define CONFIG_HEVC_DXVA2_HWACCEL 1
 %define CONFIG_HEVC_MEDIACODEC_HWACCEL 0
 %define CONFIG_HEVC_QSV_HWACCEL 1
@@ -2020,6 +2022,7 @@
 %define CONFIG_MPEG2_CUVID_HWACCEL 1
 %define CONFIG_MPEG2_XVMC_HWACCEL 0
 %define CONFIG_MPEG2_D3D11VA_HWACCEL 1
+%define CONFIG_MPEG2_D3D11VA2_HWACCEL 1
 %define CONFIG_MPEG2_DXVA2_HWACCEL 1
 %define CONFIG_MPEG2_MMAL_HWACCEL 0
 %define CONFIG_MPEG2_QSV_HWACCEL 1
@@ -2035,6 +2038,7 @@
 %define CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL 0
 %define CONFIG_VC1_CUVID_HWACCEL 1
 %define CONFIG_VC1_D3D11VA_HWACCEL 1
+%define CONFIG_VC1_D3D11VA2_HWACCEL 1
 %define CONFIG_VC1_DXVA2_HWACCEL 1
 %define CONFIG_VC1_VAAPI_HWACCEL 0
 %define CONFIG_VC1_VDPAU_HWACCEL 0
@@ -2045,10 +2049,12 @@
 %define CONFIG_VP8_QSV_HWACCEL 1
 %define CONFIG_VP9_CUVID_HWACCEL 1
 %define CONFIG_VP9_D3D11VA_HWACCEL 1
+%define CONFIG_VP9_D3D11VA2_HWACCEL 1
 %define CONFIG_VP9_DXVA2_HWACCEL 1
 %define CONFIG_VP9_MEDIACODEC_HWACCEL 0
 %define CONFIG_VP9_VAAPI_HWACCEL 0
 %define CONFIG_WMV3_D3D11VA_HWACCEL 1
+%define CONFIG_WMV3_D3D11VA2_HWACCEL 1
 %define CONFIG_WMV3_DXVA2_HWACCEL 1
 %define CONFIG_WMV3_VAAPI_HWACCEL 0
 %define CONFIG_WMV3_VDPAU_HWACCEL 0
@@ -2194,6 +2200,7 @@
 %define CONFIG_SAP_MUXER 1
 %define CONFIG_SCC_MUXER 1
 %define CONFIG_SEGMENT_MUXER 1
+%define CONFIG_STREAM_SEGMENT_MUXER 1
 %define CONFIG_SINGLEJPEG_MUXER 1
 %define CONFIG_SMJPEG_MUXER 1
 %define CONFIG_SMOOTHSTREAMING_MUXER 1

--- a/SMP/config.h
+++ b/SMP/config.h
@@ -274,6 +274,7 @@
 #define HAVE_DIRECT_H 1
 #define HAVE_DIRENT_H 0
 #define HAVE_DLFCN_H 0
+#define HAVE_DXGIDEBUG_H 1
 #define HAVE_DXVA_H 1
 #define HAVE_ES2_GL_H 0
 #define HAVE_GSM_H 0
@@ -447,8 +448,6 @@
 #define HAVE_ALSA 0
 #define HAVE_ATOMICS_NATIVE 1
 #define HAVE_DOS_PATHS 1
-#define HAVE_DXVA2_LIB 1
-#define HAVE_DXVA2API_COBJ 1
 #define HAVE_JACK 0
 #define HAVE_LIBC_MSVCRT 1
 #define HAVE_MAKEINFO 0
@@ -2021,6 +2020,7 @@
 #define CONFIG_CELLAUTO_FILTER 1
 #define CONFIG_COLOR_FILTER 1
 #define CONFIG_COREIMAGESRC_FILTER 0
+#define CONFIG_FREI0R_SRC_FILTER 0
 #define CONFIG_HALDCLUTSRC_FILTER 1
 #define CONFIG_LIFE_FILTER 1
 #define CONFIG_MANDELBROT_FILTER 1
@@ -2053,6 +2053,7 @@
 #define CONFIG_H263_VIDEOTOOLBOX_HWACCEL 0
 #define CONFIG_H264_CUVID_HWACCEL 1
 #define CONFIG_H264_D3D11VA_HWACCEL CONFIG_D3D11VA
+#define CONFIG_H264_D3D11VA2_HWACCEL CONFIG_D3D11VA
 #define CONFIG_H264_DXVA2_HWACCEL 1
 #define CONFIG_H264_MEDIACODEC_HWACCEL 0
 #define CONFIG_H264_MMAL_HWACCEL 0
@@ -2064,6 +2065,7 @@
 #define CONFIG_H264_VIDEOTOOLBOX_HWACCEL 0
 #define CONFIG_HEVC_CUVID_HWACCEL 1
 #define CONFIG_HEVC_D3D11VA_HWACCEL CONFIG_D3D11VA
+#define CONFIG_HEVC_D3D11VA2_HWACCEL CONFIG_D3D11VA
 #define CONFIG_HEVC_DXVA2_HWACCEL 1
 #define CONFIG_HEVC_MEDIACODEC_HWACCEL 0
 #define CONFIG_HEVC_QSV_HWACCEL 1
@@ -2077,6 +2079,7 @@
 #define CONFIG_MPEG2_CUVID_HWACCEL 1
 #define CONFIG_MPEG2_XVMC_HWACCEL 0
 #define CONFIG_MPEG2_D3D11VA_HWACCEL CONFIG_D3D11VA
+#define CONFIG_MPEG2_D3D11VA2_HWACCEL CONFIG_D3D11VA
 #define CONFIG_MPEG2_DXVA2_HWACCEL 1
 #define CONFIG_MPEG2_MMAL_HWACCEL 0
 #define CONFIG_MPEG2_QSV_HWACCEL 1
@@ -2092,6 +2095,7 @@
 #define CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL 0
 #define CONFIG_VC1_CUVID_HWACCEL 1
 #define CONFIG_VC1_D3D11VA_HWACCEL CONFIG_D3D11VA
+#define CONFIG_VC1_D3D11VA2_HWACCEL CONFIG_D3D11VA
 #define CONFIG_VC1_DXVA2_HWACCEL 1
 #define CONFIG_VC1_VAAPI_HWACCEL 0
 #define CONFIG_VC1_VDPAU_HWACCEL 0
@@ -2113,13 +2117,22 @@
 #include <sdkddkver.h>
 #endif
 #if defined(NTDDI_WIN10_TH2)
+#   define CONFIG_VP9_D3D11VA2_HWACCEL 1
+#else
+#   define CONFIG_VP9_D3D11VA2_HWACCEL 0
+#endif
+#ifdef _WIN32
+#include <sdkddkver.h>
+#endif
+#if defined(NTDDI_WIN10_TH2)
 #   define CONFIG_VP9_DXVA2_HWACCEL 1
 #else
 #   define CONFIG_VP9_DXVA2_HWACCEL 0
 #endif
 #define CONFIG_VP9_MEDIACODEC_HWACCEL 0
 #define CONFIG_VP9_VAAPI_HWACCEL 0
-#define CONFIG_WMV3_D3D11VA_HWACCEL 1
+#define CONFIG_WMV3_D3D11VA_HWACCEL CONFIG_D3D11VA
+#define CONFIG_WMV3_D3D11VA2_HWACCEL CONFIG_D3D11VA
 #define CONFIG_WMV3_DXVA2_HWACCEL 1
 #define CONFIG_WMV3_VAAPI_HWACCEL 0
 #define CONFIG_WMV3_VDPAU_HWACCEL 0
@@ -2265,6 +2278,7 @@
 #define CONFIG_SAP_MUXER 1
 #define CONFIG_SCC_MUXER 1
 #define CONFIG_SEGMENT_MUXER 1
+#define CONFIG_STREAM_SEGMENT_MUXER 1
 #define CONFIG_SINGLEJPEG_MUXER 1
 #define CONFIG_SMJPEG_MUXER 1
 #define CONFIG_SMOOTHSTREAMING_MUXER 1

--- a/SMP/ffmpeg.vcxproj
+++ b/SMP/ffmpeg.vcxproj
@@ -41,7 +41,6 @@
    <ClCompile Include="..\ffmpeg_hw.c" />
    <ClCompile Include="..\ffmpeg_qsv.c" />
    <ClCompile Include="..\ffmpeg_cuvid.c" />
-    <ClCompile Include="..\ffmpeg_dxva2.c" />
    <ClCompile Include="..\ffmpeg.c" />
    <ClCompile Include="ffmpeg\dce_defs.c" />
  </ItemGroup>

--- a/SMP/ffmpeg.vcxproj.filters
+++ b/SMP/ffmpeg.vcxproj.filters
@@ -36,9 +36,6 @@
    <ClCompile Include="..\ffmpeg_cuvid.c">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="..\ffmpeg_dxva2.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
    <ClCompile Include="..\ffmpeg.c">
      <Filter>Source Files</Filter>
    </ClCompile>

--- a/SMP/libavcodec.vcxproj
+++ b/SMP/libavcodec.vcxproj
@@ -143,6 +143,7 @@
    <YASM Include="..\libavcodec\x86\takdsp.asm" />
    <YASM Include="..\libavcodec\x86\ttadsp.asm" />
    <YASM Include="..\libavcodec\x86\ttaencdsp.asm" />
+    <YASM Include="..\libavcodec\x86\utvideodsp.asm" />
    <YASM Include="..\libavcodec\x86\v210enc.asm" />
    <YASM Include="..\libavcodec\x86\v210.asm" />
    <YASM Include="..\libavcodec\x86\vorbisdsp.asm" />
@@ -965,6 +966,7 @@
    <ClCompile Include="..\libavcodec\x86\takdsp_init.c" />
    <ClCompile Include="..\libavcodec\x86\ttadsp_init.c" />
    <ClCompile Include="..\libavcodec\x86\ttaencdsp_init.c" />
+    <ClCompile Include="..\libavcodec\x86\utvideodsp_init.c" />
    <ClCompile Include="..\libavcodec\x86\v210-init.c" />
    <ClCompile Include="..\libavcodec\x86\v210enc_init.c" />
    <ClCompile Include="..\libavcodec\x86\vorbisdsp_init.c" />
@@ -1101,6 +1103,9 @@
    <ClCompile Include="..\libavcodec\ttaencdsp.c">
      <ObjectFileName>$(IntDir)\libavcodec_ttaencdsp.obj</ObjectFileName>
    </ClCompile>
+    <ClCompile Include="..\libavcodec\utvideodsp.c">
+      <ObjectFileName>$(IntDir)\libavcodec_utvideodsp.obj</ObjectFileName>
+    </ClCompile>
    <ClCompile Include="..\libavcodec\v210enc.c">
      <ObjectFileName>$(IntDir)\libavcodec_v210enc.obj</ObjectFileName>
    </ClCompile>

--- a/SMP/libavcodec.vcxproj.filters
+++ b/SMP/libavcodec.vcxproj.filters
@@ -256,6 +256,9 @@
    <YASM Include="..\libavcodec\x86\ttaencdsp.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
    </YASM>
+    <YASM Include="..\libavcodec\x86\utvideodsp.asm">
+      <Filter>Source Files\libavcodec\x86</Filter>
+    </YASM>
    <YASM Include="..\libavcodec\x86\v210enc.asm">
      <Filter>Source Files\libavcodec\x86</Filter>
    </YASM>
@@ -2718,6 +2721,9 @@
    <ClCompile Include="..\libavcodec\x86\ttaencdsp_init.c">
      <Filter>Source Files\libavcodec\x86</Filter>
    </ClCompile>
+    <ClCompile Include="..\libavcodec\x86\utvideodsp_init.c">
+      <Filter>Source Files\libavcodec\x86</Filter>
+    </ClCompile>
    <ClCompile Include="..\libavcodec\x86\v210-init.c">
      <Filter>Source Files\libavcodec\x86</Filter>
    </ClCompile>
@@ -2886,6 +2892,9 @@
    <ClCompile Include="..\libavcodec\ttaencdsp.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
+    <ClCompile Include="..\libavcodec\utvideodsp.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
    <ClCompile Include="..\libavcodec\v210enc.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>

--- a/SMP/libavcodec/dce_defs.c
+++ b/SMP/libavcodec/dce_defs.c
@@ -21,7 +21,7 @@

 #include "config.h"

-#if !(CONFIG_VP9_D3D11VA_HWACCEL||CONFIG_VP9_DXVA2_HWACCEL)
+#if !(CONFIG_H264_D3D11VA2_HWACCEL||CONFIG_H264_D3D11VA_HWACCEL||CONFIG_HEVC_D3D11VA2_HWACCEL||CONFIG_HEVC_D3D11VA_HWACCEL||CONFIG_MPEG2_D3D11VA2_HWACCEL||CONFIG_MPEG2_D3D11VA_HWACCEL||CONFIG_VC1_D3D11VA2_HWACCEL||CONFIG_VC1_D3D11VA_HWACCEL||CONFIG_VP9_D3D11VA2_HWACCEL||CONFIG_VP9_D3D11VA_HWACCEL||CONFIG_VP9_DXVA2_HWACCEL||CONFIG_WMV3_D3D11VA2_HWACCEL||CONFIG_WMV3_D3D11VA_HWACCEL)
 #include "libavcodec/avcodec.h"
 #endif
 #include "libavcodec/xvmc_internal.h"
@@ -3512,10 +3512,21 @@ void ff_pixblockdsp_init_mips(PixblockDSPContext *c, AVCodecContext *avctx,
                              unsigned high_bit_depth) {return;}
 void ff_pixblockdsp_init_ppc(PixblockDSPContext *c, AVCodecContext *avctx,
                             unsigned high_bit_depth) {return;}
+void ff_psdsp_init_aarch64(PSDSPContext *s) {return;}
 void ff_psdsp_init_arm(PSDSPContext *s) {return;}
 void ff_psdsp_init_mips(PSDSPContext *s) {return;}
 void ff_qpeldsp_init_mips(QpelDSPContext *c) {return;}
 void ff_rdft_init_arm(RDFTContext *s) {return;}
+#if !(ARCH_X86_64)
+void ff_restore_rgb_planes10_sse2(uint16_t *src_r, uint16_t *src_g, uint16_t *src_b,
+                                  ptrdiff_t linesize_r, ptrdiff_t linesize_g,
+                                  ptrdiff_t linesize_b, int width, int height) {return;}
+#endif
+#if !(ARCH_X86_64)
+void ff_restore_rgb_planes_sse2(uint8_t *src_r, uint8_t *src_g, uint8_t *src_b,
+                                ptrdiff_t linesize_r, ptrdiff_t linesize_g,
+                                ptrdiff_t linesize_b, int width, int height) {return;}
+#endif
 #if !(ARCH_X86_32)
 void ff_rv34_idct_dc_add_mmx(uint8_t *dst, ptrdiff_t stride, int dc) {return;}
 #endif
@@ -3548,6 +3559,24 @@ void ff_simple_idct12_put_sse2(uint8_t *dest, ptrdiff_t line_size, int16_t *bloc
 #if !(ARCH_X86_64)
 void ff_simple_idct12_sse2(int16_t *block) {return;}
 #endif
+#if !(ARCH_X86_64)
+void ff_simple_idct8_add_avx(uint8_t *dest, ptrdiff_t line_size, int16_t *block) {return;}
+#endif
+#if !(ARCH_X86_64)
+void ff_simple_idct8_add_sse2(uint8_t *dest, ptrdiff_t line_size, int16_t *block) {return;}
+#endif
+#if !(ARCH_X86_64)
+void ff_simple_idct8_avx(int16_t *block) {return;}
+#endif
+#if !(ARCH_X86_64)
+void ff_simple_idct8_put_avx(uint8_t *dest, ptrdiff_t line_size, int16_t *block) {return;}
+#endif
+#if !(ARCH_X86_64)
+void ff_simple_idct8_put_sse2(uint8_t *dest, ptrdiff_t line_size, int16_t *block) {return;}
+#endif
+#if !(ARCH_X86_64)
+void ff_simple_idct8_sse2(int16_t *block) {return;}
+#endif
 void ff_svq1enc_init_ppc(SVQ1EncContext *c) {return;}
 void ff_synth_filter_init_aarch64(SynthFilterContext *c) {return;}
 void ff_synth_filter_init_arm(SynthFilterContext *c) {return;}
@@ -3691,6 +3720,12 @@ AVCodec ff_wmv3_crystalhd_decoder = {0};
 AVCodec ff_wmv3_vdpau_decoder = {0};
 AVHWAccel ff_h263_vaapi_hwaccel = {0};
 AVHWAccel ff_h263_videotoolbox_hwaccel = {0};
+#if !(CONFIG_H264_D3D11VA2_HWACCEL)
+AVHWAccel ff_h264_d3d11va2_hwaccel = {0};
+#endif
+#if !(CONFIG_H264_D3D11VA_HWACCEL)
+AVHWAccel ff_h264_d3d11va_hwaccel = {0};
+#endif
 AVHWAccel ff_h264_mediacodec_hwaccel = {0};
 AVHWAccel ff_h264_mmal_hwaccel = {0};
 AVHWAccel ff_h264_vaapi_hwaccel = {0};
@@ -3698,12 +3733,24 @@ AVHWAccel ff_h264_vda_hwaccel = {0};
 AVHWAccel ff_h264_vda_old_hwaccel = {0};
 AVHWAccel ff_h264_vdpau_hwaccel = {0};
 AVHWAccel ff_h264_videotoolbox_hwaccel = {0};
+#if !(CONFIG_HEVC_D3D11VA2_HWACCEL)
+AVHWAccel ff_hevc_d3d11va2_hwaccel = {0};
+#endif
+#if !(CONFIG_HEVC_D3D11VA_HWACCEL)
+AVHWAccel ff_hevc_d3d11va_hwaccel = {0};
+#endif
 AVHWAccel ff_hevc_mediacodec_hwaccel = {0};
 AVHWAccel ff_hevc_vaapi_hwaccel = {0};
 AVHWAccel ff_hevc_vdpau_hwaccel = {0};
 AVHWAccel ff_mpeg1_vdpau_hwaccel = {0};
 AVHWAccel ff_mpeg1_videotoolbox_hwaccel = {0};
 AVHWAccel ff_mpeg1_xvmc_hwaccel = {0};
+#if !(CONFIG_MPEG2_D3D11VA2_HWACCEL)
+AVHWAccel ff_mpeg2_d3d11va2_hwaccel = {0};
+#endif
+#if !(CONFIG_MPEG2_D3D11VA_HWACCEL)
+AVHWAccel ff_mpeg2_d3d11va_hwaccel = {0};
+#endif
 AVHWAccel ff_mpeg2_mediacodec_hwaccel = {0};
 AVHWAccel ff_mpeg2_mmal_hwaccel = {0};
 AVHWAccel ff_mpeg2_vaapi_hwaccel = {0};
@@ -3715,10 +3762,19 @@ AVHWAccel ff_mpeg4_mmal_hwaccel = {0};
 AVHWAccel ff_mpeg4_vaapi_hwaccel = {0};
 AVHWAccel ff_mpeg4_vdpau_hwaccel = {0};
 AVHWAccel ff_mpeg4_videotoolbox_hwaccel = {0};
+#if !(CONFIG_VC1_D3D11VA2_HWACCEL)
+AVHWAccel ff_vc1_d3d11va2_hwaccel = {0};
+#endif
+#if !(CONFIG_VC1_D3D11VA_HWACCEL)
+AVHWAccel ff_vc1_d3d11va_hwaccel = {0};
+#endif
 AVHWAccel ff_vc1_mmal_hwaccel = {0};
 AVHWAccel ff_vc1_vaapi_hwaccel = {0};
 AVHWAccel ff_vc1_vdpau_hwaccel = {0};
 AVHWAccel ff_vp8_mediacodec_hwaccel = {0};
+#if !(CONFIG_VP9_D3D11VA2_HWACCEL)
+AVHWAccel ff_vp9_d3d11va2_hwaccel = {0};
+#endif
 #if !(CONFIG_VP9_D3D11VA_HWACCEL)
 AVHWAccel ff_vp9_d3d11va_hwaccel = {0};
 #endif
@@ -3727,5 +3783,11 @@ AVHWAccel ff_vp9_dxva2_hwaccel = {0};
 #endif
 AVHWAccel ff_vp9_mediacodec_hwaccel = {0};
 AVHWAccel ff_vp9_vaapi_hwaccel = {0};
+#if !(CONFIG_WMV3_D3D11VA2_HWACCEL)
+AVHWAccel ff_wmv3_d3d11va2_hwaccel = {0};
+#endif
+#if !(CONFIG_WMV3_D3D11VA_HWACCEL)
+AVHWAccel ff_wmv3_d3d11va_hwaccel = {0};
+#endif
 AVHWAccel ff_wmv3_vaapi_hwaccel = {0};
 AVHWAccel ff_wmv3_vdpau_hwaccel = {0};
--- a/SMP/libavutil.vcxproj
+++ b/SMP/libavutil.vcxproj
@@ -150,6 +150,7 @@
    <ClCompile Include="..\libavutil\x86\imgutils_init.c" />
    <ClCompile Include="..\libavutil\x86\lls_init.c" />
    <ClCompile Include="..\libavutil\x86\pixelutils_init.c" />
+    <ClCompile Include="libavutil\hwcontext_d3d11va_wrap.c" />
    <ClCompile Include="libavutil\dce_defs.c" />
    <ClCompile Include="..\libavutil\float_dsp.c">
      <ObjectFileName>$(IntDir)\libavutil_float_dsp.obj</ObjectFileName>
@@ -203,6 +204,7 @@
    <ClInclude Include="..\libavutil\hmac.h" />
    <ClInclude Include="..\libavutil\hwcontext.h" />
    <ClInclude Include="..\libavutil\hwcontext_cuda.h" />
+    <ClInclude Include="..\libavutil\hwcontext_d3d11va.h" />
    <ClInclude Include="..\libavutil\hwcontext_dxva2.h" />
    <ClInclude Include="..\libavutil\hwcontext_qsv.h" />
    <ClInclude Include="..\libavutil\hwcontext_vaapi.h" />
@@ -550,6 +552,7 @@ copy ..\libavutil\hash.h $(OutDir)\include\libavutil
 copy ..\libavutil\hmac.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_cuda.h $(OutDir)\include\libavutil
+copy ..\libavutil\hwcontext_d3d11va.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_dxva2.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_qsv.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_vaapi.h $(OutDir)\include\libavutil
@@ -691,6 +694,7 @@ copy ..\libavutil\hash.h $(OutDir)\include\libavutil
 copy ..\libavutil\hmac.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_cuda.h $(OutDir)\include\libavutil
+copy ..\libavutil\hwcontext_d3d11va.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_dxva2.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_qsv.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_vaapi.h $(OutDir)\include\libavutil
@@ -838,6 +842,7 @@ copy ..\libavutil\hash.h $(OutDir)\include\libavutil
 copy ..\libavutil\hmac.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_cuda.h $(OutDir)\include\libavutil
+copy ..\libavutil\hwcontext_d3d11va.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_dxva2.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_qsv.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_vaapi.h $(OutDir)\include\libavutil
@@ -984,6 +989,7 @@ copy ..\libavutil\hash.h $(OutDir)\include\libavutil
 copy ..\libavutil\hmac.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_cuda.h $(OutDir)\include\libavutil
+copy ..\libavutil\hwcontext_d3d11va.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_dxva2.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_qsv.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_vaapi.h $(OutDir)\include\libavutil
@@ -1131,6 +1137,7 @@ copy ..\libavutil\hash.h $(OutDir)\include\libavutil
 copy ..\libavutil\hmac.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_cuda.h $(OutDir)\include\libavutil
+copy ..\libavutil\hwcontext_d3d11va.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_dxva2.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_qsv.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_vaapi.h $(OutDir)\include\libavutil
@@ -1277,6 +1284,7 @@ copy ..\libavutil\hash.h $(OutDir)\include\libavutil
 copy ..\libavutil\hmac.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_cuda.h $(OutDir)\include\libavutil
+copy ..\libavutil\hwcontext_d3d11va.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_dxva2.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_qsv.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_vaapi.h $(OutDir)\include\libavutil
@@ -1424,6 +1432,7 @@ copy ..\libavutil\hash.h $(OutDir)\include\libavutil
 copy ..\libavutil\hmac.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_cuda.h $(OutDir)\include\libavutil
+copy ..\libavutil\hwcontext_d3d11va.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_dxva2.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_qsv.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_vaapi.h $(OutDir)\include\libavutil
@@ -1571,6 +1580,7 @@ copy ..\libavutil\hash.h $(OutDir)\include\libavutil
 copy ..\libavutil\hmac.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_cuda.h $(OutDir)\include\libavutil
+copy ..\libavutil\hwcontext_d3d11va.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_dxva2.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_qsv.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_vaapi.h $(OutDir)\include\libavutil
@@ -1726,6 +1736,7 @@ copy ..\libavutil\hash.h $(OutDir)\include\libavutil
 copy ..\libavutil\hmac.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_cuda.h $(OutDir)\include\libavutil
+copy ..\libavutil\hwcontext_d3d11va.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_dxva2.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_qsv.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_vaapi.h $(OutDir)\include\libavutil
@@ -1880,6 +1891,7 @@ copy ..\libavutil\hash.h $(OutDir)\include\libavutil
 copy ..\libavutil\hmac.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_cuda.h $(OutDir)\include\libavutil
+copy ..\libavutil\hwcontext_d3d11va.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_dxva2.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_qsv.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_vaapi.h $(OutDir)\include\libavutil
@@ -2035,6 +2047,7 @@ copy ..\libavutil\hash.h $(OutDir)\include\libavutil
 copy ..\libavutil\hmac.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_cuda.h $(OutDir)\include\libavutil
+copy ..\libavutil\hwcontext_d3d11va.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_dxva2.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_qsv.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_vaapi.h $(OutDir)\include\libavutil
@@ -2189,6 +2202,7 @@ copy ..\libavutil\hash.h $(OutDir)\include\libavutil
 copy ..\libavutil\hmac.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_cuda.h $(OutDir)\include\libavutil
+copy ..\libavutil\hwcontext_d3d11va.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_dxva2.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_qsv.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_vaapi.h $(OutDir)\include\libavutil
@@ -2336,6 +2350,7 @@ copy ..\libavutil\hash.h $(OutDir)\include\libavutil
 copy ..\libavutil\hmac.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_cuda.h $(OutDir)\include\libavutil
+copy ..\libavutil\hwcontext_d3d11va.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_dxva2.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_qsv.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_vaapi.h $(OutDir)\include\libavutil
@@ -2483,6 +2498,7 @@ copy ..\libavutil\hash.h $(OutDir)\include\libavutil
 copy ..\libavutil\hmac.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_cuda.h $(OutDir)\include\libavutil
+copy ..\libavutil\hwcontext_d3d11va.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_dxva2.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_qsv.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_vaapi.h $(OutDir)\include\libavutil

--- a/SMP/libavutil.vcxproj.filters
+++ b/SMP/libavutil.vcxproj.filters
@@ -279,6 +279,9 @@
    <ClCompile Include="..\libavutil\x86\pixelutils_init.c">
      <Filter>Source Files\libavutil\x86</Filter>
    </ClCompile>
+    <ClCompile Include="libavutil\hwcontext_d3d11va_wrap.c">
+      <Filter>Source Files\libavutil</Filter>
+    </ClCompile>
    <ClCompile Include="libavutil\dce_defs.c">
      <Filter>Source Files\libavutil</Filter>
    </ClCompile>
@@ -398,6 +401,9 @@
    <ClInclude Include="..\libavutil\hwcontext_cuda.h">
      <Filter>Header Files\libavutil</Filter>
    </ClInclude>
+    <ClInclude Include="..\libavutil\hwcontext_d3d11va.h">
+      <Filter>Header Files\libavutil</Filter>
+    </ClInclude>
    <ClInclude Include="..\libavutil\hwcontext_dxva2.h">
      <Filter>Header Files\libavutil</Filter>
    </ClInclude>

--- a/SMP/libavutil/hwcontext_d3d11va_wrap.c
+++ b/SMP/libavutil/hwcontext_d3d11va_wrap.c
+/** hwcontext_d3d11va.c file wrapper for libavutil
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "config.h"
+#if CONFIG_D3D11VA
+#   include "../../libavutil/hwcontext_d3d11va.c"
+#endif
\ No newline at end of file