projects: Update for recent upstream merge.

SMP/config.asm

@@ -199,6 +199,7 @@
 %define HAVE_DEV_VIDEO_METEOR_IOCTL_METEOR_H 0
 %define HAVE_DIRECT_H 1
 %define HAVE_DLFCN_H 0
+%define HAVE_D3D11_H 1
 %define HAVE_DXVA_H 1
 %define HAVE_ES2_GL_H 0
 %define HAVE_GSM_H 0
@@ -329,6 +330,7 @@
 %define HAVE_XMM_CLOBBERS 1
 %define HAVE_CONDITION_VARIABLE_PTR 1
 %define HAVE_DXVA_PICPARAMS_HEVC 1
+%define HAVE_ID3D11VIDEODECODER 1
 %define HAVE_SOCKLEN_T 1
 %define HAVE_STRUCT_ADDRINFO 1
 %define HAVE_STRUCT_GROUP_SOURCE_REQ 1
@@ -344,6 +346,8 @@
 %define HAVE_STRUCT_V4L2_FRMIVALENUM_DISCRETE 0
 %define HAVE_ATOMICS_NATIVE 1
 %define HAVE_DOS_PATHS 1
+%define HAVE_D3D11_COBJ 1
+%define HAVE_D3D11VA_LIB 1
 %define HAVE_DXVA2API_COBJ 1
 %define HAVE_DXVA2_LIB 1
 %define HAVE_LIBC_MSVCRT 1
@@ -480,6 +484,7 @@
 %define CONFIG_SMALL 0
 %define CONFIG_STATIC 1
 %define CONFIG_SWSCALE_ALPHA 1
+%define CONFIG_D3D11VA 1
 %define CONFIG_DXVA2 1
 %define CONFIG_VAAPI 0
 %define CONFIG_VDA 0
@@ -1624,6 +1629,7 @@
 %define CONFIG_MOVIE_FILTER 1
 %define CONFIG_H263_VAAPI_HWACCEL 0
 %define CONFIG_H263_VDPAU_HWACCEL 0
+%define CONFIG_H264_D3D11VA_HWACCEL 1
 %define CONFIG_H264_DXVA2_HWACCEL 1
 %define CONFIG_H264_MMAL_HWACCEL 0
 %define CONFIG_H264_QSV_HWACCEL 1
@@ -1631,18 +1637,22 @@
 %define CONFIG_H264_VDA_HWACCEL 0
 %define CONFIG_H264_VDA_OLD_HWACCEL 0
 %define CONFIG_H264_VDPAU_HWACCEL 0
+%define CONFIG_HEVC_D3D11VA_HWACCEL 1
 %define CONFIG_HEVC_DXVA2_HWACCEL 1
 %define CONFIG_MPEG1_XVMC_HWACCEL 0
 %define CONFIG_MPEG1_VDPAU_HWACCEL 0
 %define CONFIG_MPEG2_XVMC_HWACCEL 0
+%define CONFIG_MPEG2_D3D11VA_HWACCEL 1
 %define CONFIG_MPEG2_DXVA2_HWACCEL 1
 %define CONFIG_MPEG2_VAAPI_HWACCEL 0
 %define CONFIG_MPEG2_VDPAU_HWACCEL 0
 %define CONFIG_MPEG4_VAAPI_HWACCEL 0
 %define CONFIG_MPEG4_VDPAU_HWACCEL 0
+%define CONFIG_VC1_D3D11VA_HWACCEL 1
 %define CONFIG_VC1_DXVA2_HWACCEL 1
 %define CONFIG_VC1_VAAPI_HWACCEL 0
 %define CONFIG_VC1_VDPAU_HWACCEL 0
+%define CONFIG_WMV3_D3D11VA_HWACCEL 1
 %define CONFIG_WMV3_DXVA2_HWACCEL 1
 %define CONFIG_WMV3_VAAPI_HWACCEL 0
 %define CONFIG_WMV3_VDPAU_HWACCEL 0

SMP/config.h

@@ -230,6 +230,7 @@
 #define HAVE_DEV_VIDEO_METEOR_IOCTL_METEOR_H 0
 #define HAVE_DIRECT_H 1
 #define HAVE_DLFCN_H 0
+#define HAVE_D3D11_H 1
 #define HAVE_DXVA_H 1
 #define HAVE_ES2_GL_H 0
 #define HAVE_GSM_H 0
@@ -368,6 +369,7 @@
 #define HAVE_XMM_CLOBBERS 1
 #define HAVE_CONDITION_VARIABLE_PTR 1
 #define HAVE_DXVA_PICPARAMS_HEVC 1
+#define HAVE_ID3D11VIDEODECODER 1
 #define HAVE_SOCKLEN_T 1
 #define HAVE_STRUCT_ADDRINFO 1
 #define HAVE_STRUCT_GROUP_SOURCE_REQ 1
@@ -383,6 +385,8 @@
 #define HAVE_STRUCT_V4L2_FRMIVALENUM_DISCRETE 0
 #define HAVE_ATOMICS_NATIVE 1
 #define HAVE_DOS_PATHS 1
+#define HAVE_D3D11_COBJ 1
+#define HAVE_D3D11VA_LIB 1
 #define HAVE_DXVA2API_COBJ 1
 #define HAVE_DXVA2_LIB 1
 #define HAVE_LIBC_MSVCRT 1
@@ -527,6 +531,7 @@
 #   define CONFIG_STATIC 1
 #endif
 #define CONFIG_SWSCALE_ALPHA 1
+#define CONFIG_D3D11VA 1
 #define CONFIG_DXVA2 1
 #define CONFIG_VAAPI 0
 #define CONFIG_VDA 0
@@ -1671,6 +1676,7 @@
 #define CONFIG_MOVIE_FILTER 1
 #define CONFIG_H263_VAAPI_HWACCEL 0
 #define CONFIG_H263_VDPAU_HWACCEL 0
+#define CONFIG_H264_D3D11VA_HWACCEL 1
 #define CONFIG_H264_DXVA2_HWACCEL 1
 #define CONFIG_H264_MMAL_HWACCEL 0
 #define CONFIG_H264_QSV_HWACCEL 1
@@ -1678,18 +1684,22 @@
 #define CONFIG_H264_VDA_HWACCEL 0
 #define CONFIG_H264_VDA_OLD_HWACCEL 0
 #define CONFIG_H264_VDPAU_HWACCEL 0
+#define CONFIG_HEVC_D3D11VA_HWACCEL 1
 #define CONFIG_HEVC_DXVA2_HWACCEL 1
 #define CONFIG_MPEG1_XVMC_HWACCEL 0
 #define CONFIG_MPEG1_VDPAU_HWACCEL 0
 #define CONFIG_MPEG2_XVMC_HWACCEL 0
+#define CONFIG_MPEG2_D3D11VA_HWACCEL 1
 #define CONFIG_MPEG2_DXVA2_HWACCEL 1
 #define CONFIG_MPEG2_VAAPI_HWACCEL 0
 #define CONFIG_MPEG2_VDPAU_HWACCEL 0
 #define CONFIG_MPEG4_VAAPI_HWACCEL 0
 #define CONFIG_MPEG4_VDPAU_HWACCEL 0
+#define CONFIG_VC1_D3D11VA_HWACCEL 1
 #define CONFIG_VC1_DXVA2_HWACCEL 1
 #define CONFIG_VC1_VAAPI_HWACCEL 0
 #define CONFIG_VC1_VDPAU_HWACCEL 0
+#define CONFIG_WMV3_D3D11VA_HWACCEL 1
 #define CONFIG_WMV3_DXVA2_HWACCEL 1
 #define CONFIG_WMV3_VAAPI_HWACCEL 0
 #define CONFIG_WMV3_VDPAU_HWACCEL 0

SMP/libavcodec.vcxproj

@@ -1670,6 +1670,7 @@
     <ClInclude Include="..\libavcodec\avcodec.h" />
     <ClInclude Include="..\libavcodec\avfft.h" />
     <ClInclude Include="..\libavcodec\dv_profile.h" />
+    <ClInclude Include="..\libavcodec\d3d11va.h" />
     <ClInclude Include="..\libavcodec\dxva2.h" />
     <ClInclude Include="..\libavcodec\old_codec_ids.h" />
     <ClInclude Include="..\libavcodec\qsv.h" />
@@ -1931,6 +1932,7 @@ mkdir $(OutDir)\include\libavcodec
 copy ..\libavcodec\avcodec.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\avfft.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\dv_profile.h $(OutDir)\include\libavcodec
+copy ..\libavcodec\d3d11va.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\dxva2.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\old_codec_ids.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\qsv.h $(OutDir)\include\libavcodec
@@ -2004,6 +2006,7 @@ mkdir $(OutDir)\include\libavcodec
 copy ..\libavcodec\avcodec.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\avfft.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\dv_profile.h $(OutDir)\include\libavcodec
+copy ..\libavcodec\d3d11va.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\dxva2.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\old_codec_ids.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\qsv.h $(OutDir)\include\libavcodec
@@ -2084,6 +2087,7 @@ mkdir $(OutDir)\include\libavcodec
 copy ..\libavcodec\avcodec.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\avfft.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\dv_profile.h $(OutDir)\include\libavcodec
+copy ..\libavcodec\d3d11va.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\dxva2.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\old_codec_ids.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\qsv.h $(OutDir)\include\libavcodec
@@ -2167,6 +2171,7 @@ mkdir $(OutDir)\include\libavcodec
 copy ..\libavcodec\avcodec.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\avfft.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\dv_profile.h $(OutDir)\include\libavcodec
+copy ..\libavcodec\d3d11va.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\dxva2.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\old_codec_ids.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\qsv.h $(OutDir)\include\libavcodec
@@ -2252,6 +2257,7 @@ mkdir $(OutDir)\include\libavcodec
 copy ..\libavcodec\avcodec.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\avfft.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\dv_profile.h $(OutDir)\include\libavcodec
+copy ..\libavcodec\d3d11va.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\dxva2.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\old_codec_ids.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\qsv.h $(OutDir)\include\libavcodec
@@ -2335,6 +2341,7 @@ mkdir $(OutDir)\include\libavcodec
 copy ..\libavcodec\avcodec.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\avfft.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\dv_profile.h $(OutDir)\include\libavcodec
+copy ..\libavcodec\d3d11va.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\dxva2.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\old_codec_ids.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\qsv.h $(OutDir)\include\libavcodec
@@ -2422,6 +2429,7 @@ mkdir $(OutDir)\include\libavcodec
 copy ..\libavcodec\avcodec.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\avfft.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\dv_profile.h $(OutDir)\include\libavcodec
+copy ..\libavcodec\d3d11va.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\dxva2.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\old_codec_ids.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\qsv.h $(OutDir)\include\libavcodec
@@ -2503,6 +2511,7 @@ mkdir $(OutDir)\include\libavcodec
 copy ..\libavcodec\avcodec.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\avfft.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\dv_profile.h $(OutDir)\include\libavcodec
+copy ..\libavcodec\d3d11va.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\dxva2.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\old_codec_ids.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\qsv.h $(OutDir)\include\libavcodec
@@ -2591,6 +2600,7 @@ mkdir $(OutDir)\include\libavcodec
 copy ..\libavcodec\avcodec.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\avfft.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\dv_profile.h $(OutDir)\include\libavcodec
+copy ..\libavcodec\d3d11va.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\dxva2.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\old_codec_ids.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\qsv.h $(OutDir)\include\libavcodec
@@ -2677,6 +2687,7 @@ mkdir $(OutDir)\include\libavcodec
 copy ..\libavcodec\avcodec.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\avfft.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\dv_profile.h $(OutDir)\include\libavcodec
+copy ..\libavcodec\d3d11va.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\dxva2.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\old_codec_ids.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\qsv.h $(OutDir)\include\libavcodec
@@ -2765,6 +2776,7 @@ mkdir $(OutDir)\include\libavcodec
 copy ..\libavcodec\avcodec.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\avfft.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\dv_profile.h $(OutDir)\include\libavcodec
+copy ..\libavcodec\d3d11va.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\dxva2.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\old_codec_ids.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\qsv.h $(OutDir)\include\libavcodec
@@ -2851,6 +2863,7 @@ mkdir $(OutDir)\include\libavcodec
 copy ..\libavcodec\avcodec.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\avfft.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\dv_profile.h $(OutDir)\include\libavcodec
+copy ..\libavcodec\d3d11va.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\dxva2.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\old_codec_ids.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\qsv.h $(OutDir)\include\libavcodec
@@ -2932,6 +2945,7 @@ mkdir $(OutDir)\include\libavcodec
 copy ..\libavcodec\avcodec.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\avfft.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\dv_profile.h $(OutDir)\include\libavcodec
+copy ..\libavcodec\d3d11va.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\dxva2.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\old_codec_ids.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\qsv.h $(OutDir)\include\libavcodec
@@ -3012,6 +3026,7 @@ mkdir $(OutDir)\include\libavcodec
 copy ..\libavcodec\avcodec.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\avfft.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\dv_profile.h $(OutDir)\include\libavcodec
+copy ..\libavcodec\d3d11va.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\dxva2.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\old_codec_ids.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\qsv.h $(OutDir)\include\libavcodec

SMP/libavcodec.vcxproj.filters

@@ -2479,6 +2479,9 @@
     <ClInclude Include="..\libavcodec\dv_profile.h">
       <Filter>Header Files\libavcodec</Filter>
     </ClInclude>
+    <ClInclude Include="..\libavcodec\d3d11va.h">
+      <Filter>Header Files\libavcodec</Filter>
+    </ClInclude>
     <ClInclude Include="..\libavcodec\dxva2.h">
       <Filter>Header Files\libavcodec</Filter>
     </ClInclude>