projects: Update for recent upstream merge.

SMP/config.asm

@@ -292,6 +292,14 @@
 %define HAVE_SINF 1
 %define HAVE_TRUNC 1
 %define HAVE_TRUNCF 1
+%define HAVE_ATOMICS_NATIVE 1
+%define HAVE_DOS_PATHS 1
+%define HAVE_LIBC_MSVCRT 1
+%define HAVE_MMAL_PARAMETER_VIDEO_MAX_NUM_CALLBACKS 0
+%define HAVE_SECTION_DATA_REL_RO 0
+%define HAVE_THREADS 1
+%define HAVE_UWP 0
+%define HAVE_WINRT 0
 %define HAVE_ACCESS 1
 %define HAVE_ALIGNED_MALLOC 1
 %define HAVE_ARC4RANDOM 0
@@ -328,6 +336,7 @@
 %define HAVE_POSIX_MEMALIGN 0
 %define HAVE_PTHREAD_CANCEL 0
 %define HAVE_SCHED_GETAFFINITY 0
+%define HAVE_SECITEMIMPORT 0
 %define HAVE_SETCONSOLETEXTATTRIBUTE 1
 %define HAVE_SETCONSOLECTRLHANDLER 1
 %define HAVE_SETMODE 1
@@ -340,6 +349,10 @@
 %define HAVE_UTGETOSTYPEFROMSTRING 0
 %define HAVE_VIRTUALALLOC 1
 %define HAVE_WGLGETPROCADDRESS 1
+%define HAVE_VAAPI_DRM 0
+%define HAVE_VAAPI_X11 0
+%define HAVE_VDPAU_X11 0
+%define HAVE_WINCRYPT 1
 %define HAVE_PTHREADS 0
 %define HAVE_OS2THREADS 0
 %define HAVE_W32THREADS 1
@@ -380,23 +393,11 @@
 %define HAVE_STRUCT_SOCKADDR_STORAGE 1
 %define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 0
 %define HAVE_STRUCT_V4L2_FRMIVALENUM_DISCRETE 0
-%define HAVE_ATOMICS_NATIVE 1
-%define HAVE_DOS_PATHS 1
-%define HAVE_LIBC_MSVCRT 1
 %define HAVE_MAKEINFO 0
 %define HAVE_MAKEINFO_HTML 0
-%define HAVE_MMAL_PARAMETER_VIDEO_MAX_NUM_CALLBACKS 0
 %define HAVE_PERL 0
 %define HAVE_POD2MAN 0
-%define HAVE_SECTION_DATA_REL_RO 0
 %define HAVE_TEXI2HTML 0
-%define HAVE_THREADS 1
-%define HAVE_UWP 0
-%define HAVE_VAAPI_DRM 0
-%define HAVE_VAAPI_X11 0
-%define HAVE_VDPAU_X11 0
-%define HAVE_WINRT 0
-%define HAVE_WINCRYPT 1
 %define CONFIG_DOC 0
 %define CONFIG_HTMLPAGES 0
 %define CONFIG_MANPAGES 0
@@ -1393,6 +1394,7 @@
 %define CONFIG_HEVC_QSV_ENCODER 1
 %define CONFIG_HEVC_V4L2M2M_ENCODER 0
 %define CONFIG_HEVC_VAAPI_ENCODER 0
+%define CONFIG_HEVC_VIDEOTOOLBOX_ENCODER 0
 %define CONFIG_LIBKVAZAAR_ENCODER 0
 %define CONFIG_MJPEG_QSV_ENCODER 1
 %define CONFIG_MJPEG_VAAPI_ENCODER 0
@@ -1436,6 +1438,7 @@
 %define CONFIG_MPEG2_D3D11VA2_HWACCEL 1
 %define CONFIG_MPEG2_DXVA2_HWACCEL 1
 %define CONFIG_MPEG2_MMAL_HWACCEL 0
+%define CONFIG_MPEG2_NVDEC_HWACCEL 1
 %define CONFIG_MPEG2_QSV_HWACCEL 1
 %define CONFIG_MPEG2_VAAPI_HWACCEL 0
 %define CONFIG_MPEG2_VDPAU_HWACCEL 0
@@ -1451,6 +1454,7 @@
 %define CONFIG_VC1_D3D11VA_HWACCEL 1
 %define CONFIG_VC1_D3D11VA2_HWACCEL 1
 %define CONFIG_VC1_DXVA2_HWACCEL 1
+%define CONFIG_VC1_NVDEC_HWACCEL 1
 %define CONFIG_VC1_VAAPI_HWACCEL 0
 %define CONFIG_VC1_VDPAU_HWACCEL 0
 %define CONFIG_VC1_MMAL_HWACCEL 0
@@ -1463,10 +1467,12 @@
 %define CONFIG_VP9_D3D11VA2_HWACCEL 1
 %define CONFIG_VP9_DXVA2_HWACCEL 1
 %define CONFIG_VP9_MEDIACODEC_HWACCEL 0
+%define CONFIG_VP9_NVDEC_HWACCEL 1
 %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_NVDEC_HWACCEL 1
 %define CONFIG_WMV3_VAAPI_HWACCEL 0
 %define CONFIG_WMV3_VDPAU_HWACCEL 0
 %define CONFIG_AAC_PARSER 1
@@ -1614,6 +1620,7 @@
 %define CONFIG_LADSPA_FILTER 0
 %define CONFIG_LOUDNORM_FILTER 1
 %define CONFIG_LOWPASS_FILTER 1
+%define CONFIG_MCOMPAND_FILTER 1
 %define CONFIG_PAN_FILTER 1
 %define CONFIG_REPLAYGAIN_FILTER 1
 %define CONFIG_RESAMPLE_FILTER 0

SMP/config.h

@@ -322,6 +322,14 @@
 #define HAVE_SINF 1
 #define HAVE_TRUNC 1
 #define HAVE_TRUNCF 1
+#define HAVE_ATOMICS_NATIVE 1
+#define HAVE_DOS_PATHS 1
+#define HAVE_LIBC_MSVCRT 1
+#define HAVE_MMAL_PARAMETER_VIDEO_MAX_NUM_CALLBACKS 0
+#define HAVE_SECTION_DATA_REL_RO 0
+#define HAVE_THREADS 1
+#define HAVE_UWP 0
+#define HAVE_WINRT 0
 #define HAVE_ACCESS 1
 #define HAVE_ALIGNED_MALLOC 1
 #define HAVE_ARC4RANDOM 0
@@ -358,6 +366,7 @@
 #define HAVE_POSIX_MEMALIGN 0
 #define HAVE_PTHREAD_CANCEL 0
 #define HAVE_SCHED_GETAFFINITY 0
+#define HAVE_SECITEMIMPORT 0
 #define HAVE_SETCONSOLETEXTATTRIBUTE 1
 #define HAVE_SETCONSOLECTRLHANDLER 1
 #define HAVE_SETMODE 1
@@ -370,6 +379,10 @@
 #define HAVE_UTGETOSTYPEFROMSTRING 0
 #define HAVE_VIRTUALALLOC 1
 #define HAVE_WGLGETPROCADDRESS 1
+#define HAVE_VAAPI_DRM 0
+#define HAVE_VAAPI_X11 0
+#define HAVE_VDPAU_X11 0
+#define HAVE_WINCRYPT 1
 #define HAVE_PTHREADS 0
 #define HAVE_OS2THREADS 0
 #define HAVE_W32THREADS 1
@@ -422,23 +435,11 @@
 #define HAVE_STRUCT_SOCKADDR_STORAGE 1
 #define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 0
 #define HAVE_STRUCT_V4L2_FRMIVALENUM_DISCRETE 0
-#define HAVE_ATOMICS_NATIVE 1
-#define HAVE_DOS_PATHS 1
-#define HAVE_LIBC_MSVCRT 1
 #define HAVE_MAKEINFO 0
 #define HAVE_MAKEINFO_HTML 0
-#define HAVE_MMAL_PARAMETER_VIDEO_MAX_NUM_CALLBACKS 0
 #define HAVE_PERL 0
 #define HAVE_POD2MAN 0
-#define HAVE_SECTION_DATA_REL_RO 0
 #define HAVE_TEXI2HTML 0
-#define HAVE_THREADS 1
-#define HAVE_UWP 0
-#define HAVE_VAAPI_DRM 0
-#define HAVE_VAAPI_X11 0
-#define HAVE_VDPAU_X11 0
-#define HAVE_WINRT 0
-#define HAVE_WINCRYPT 1
 #define CONFIG_DOC 0
 #define CONFIG_HTMLPAGES 0
 #define CONFIG_MANPAGES 0
@@ -1450,6 +1451,7 @@
 #define CONFIG_HEVC_QSV_ENCODER 1
 #define CONFIG_HEVC_V4L2M2M_ENCODER 0
 #define CONFIG_HEVC_VAAPI_ENCODER 0
+#define CONFIG_HEVC_VIDEOTOOLBOX_ENCODER 0
 #define CONFIG_LIBKVAZAAR_ENCODER 0
 #define CONFIG_MJPEG_QSV_ENCODER 1
 #define CONFIG_MJPEG_VAAPI_ENCODER 0
@@ -1493,6 +1495,7 @@
 #define CONFIG_MPEG2_D3D11VA2_HWACCEL CONFIG_D3D11VA
 #define CONFIG_MPEG2_DXVA2_HWACCEL 1
 #define CONFIG_MPEG2_MMAL_HWACCEL 0
+#define CONFIG_MPEG2_NVDEC_HWACCEL 1
 #define CONFIG_MPEG2_QSV_HWACCEL 1
 #define CONFIG_MPEG2_VAAPI_HWACCEL 0
 #define CONFIG_MPEG2_VDPAU_HWACCEL 0
@@ -1508,6 +1511,7 @@
 #define CONFIG_VC1_D3D11VA_HWACCEL CONFIG_D3D11VA
 #define CONFIG_VC1_D3D11VA2_HWACCEL CONFIG_D3D11VA
 #define CONFIG_VC1_DXVA2_HWACCEL 1
+#define CONFIG_VC1_NVDEC_HWACCEL 1
 #define CONFIG_VC1_VAAPI_HWACCEL 0
 #define CONFIG_VC1_VDPAU_HWACCEL 0
 #define CONFIG_VC1_MMAL_HWACCEL 0
@@ -1541,10 +1545,12 @@
 #   define CONFIG_VP9_DXVA2_HWACCEL 0
 #endif
 #define CONFIG_VP9_MEDIACODEC_HWACCEL 0
+#define CONFIG_VP9_NVDEC_HWACCEL 1
 #define CONFIG_VP9_VAAPI_HWACCEL 0
 #define CONFIG_WMV3_D3D11VA_HWACCEL CONFIG_D3D11VA
 #define CONFIG_WMV3_D3D11VA2_HWACCEL CONFIG_D3D11VA
 #define CONFIG_WMV3_DXVA2_HWACCEL 1
+#define CONFIG_WMV3_NVDEC_HWACCEL 1
 #define CONFIG_WMV3_VAAPI_HWACCEL 0
 #define CONFIG_WMV3_VDPAU_HWACCEL 0
 #define CONFIG_AAC_PARSER 1
@@ -1692,6 +1698,7 @@
 #define CONFIG_LADSPA_FILTER 0
 #define CONFIG_LOUDNORM_FILTER 1
 #define CONFIG_LOWPASS_FILTER 1
+#define CONFIG_MCOMPAND_FILTER 1
 #define CONFIG_PAN_FILTER 1
 #define CONFIG_REPLAYGAIN_FILTER 1
 #define CONFIG_RESAMPLE_FILTER 0

SMP/libavcodec.vcxproj

@@ -239,7 +239,6 @@
     <ClCompile Include="..\libavcodec\msmpeg4data.c" />
     <ClCompile Include="..\libavcodec\ivi_dsp.c" />
     <ClCompile Include="..\libavcodec\jpegtables.c" />
-    <ClCompile Include="..\libavcodec\libxvid_rc.c" />
     <ClCompile Include="..\libavcodec\lpc.c" />
     <ClCompile Include="..\libavcodec\lsp.c" />
     <ClCompile Include="..\libavcodec\lzf.c" />
@@ -849,7 +848,10 @@
     <ClCompile Include="..\libavcodec\dxva2_hevc.c" />
     <ClCompile Include="..\libavcodec\nvdec_hevc.c" />
     <ClCompile Include="..\libavcodec\dxva2_mpeg2.c" />
+    <ClCompile Include="..\libavcodec\nvdec_mpeg12.c" />
     <ClCompile Include="..\libavcodec\dxva2_vc1.c" />
+    <ClCompile Include="..\libavcodec\nvdec_vc1.c" />
+    <ClCompile Include="..\libavcodec\nvdec_vp9.c" />
     <ClCompile Include="..\libavcodec\libilbc.c" />
     <ClCompile Include="..\libavcodec\libmp3lame.c" />
     <ClCompile Include="..\libavcodec\libopusdec.c" />
@@ -866,6 +868,7 @@
     <ClCompile Include="..\libavcodec\libx264.c" />
     <ClCompile Include="..\libavcodec\libx265.c" />
     <ClCompile Include="..\libavcodec\libxvid.c" />
+    <ClCompile Include="..\libavcodec\libxvid_rc.c" />
     <ClCompile Include="..\libavcodec\latm_parser.c" />
     <ClCompile Include="..\libavcodec\aac_parser.c" />
     <ClCompile Include="..\libavcodec\aac_ac3_parser.c" />

SMP/libavcodec.vcxproj.filters

@@ -540,9 +540,6 @@
     <ClCompile Include="..\libavcodec\jpegtables.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavcodec\libxvid_rc.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
     <ClCompile Include="..\libavcodec\lpc.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -2370,9 +2367,18 @@
     <ClCompile Include="..\libavcodec\dxva2_mpeg2.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\nvdec_mpeg12.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\dxva2_vc1.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\nvdec_vc1.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libavcodec\nvdec_vp9.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\libilbc.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -2421,6 +2427,9 @@
     <ClCompile Include="..\libavcodec\libxvid.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\libxvid_rc.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\latm_parser.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>

SMP/libavcodec/dce_defs.c

@@ -3630,6 +3630,7 @@ const AVCodec ff_hevc_rkmpp_decoder = {0};
 const AVCodec ff_hevc_v4l2m2m_decoder = {0};
 const AVCodec ff_hevc_v4l2m2m_encoder = {0};
 const AVCodec ff_hevc_vaapi_encoder = {0};
+const AVCodec ff_hevc_videotoolbox_encoder = {0};
 const AVCodec ff_ilbc_at_decoder = {0};
 const AVCodec ff_ilbc_at_encoder = {0};
 const AVCodec ff_libcelt_decoder = {0};

SMP/libavfilter.vcxproj

@@ -175,6 +175,7 @@
     <ClCompile Include="..\libavfilter\af_join.c" />
     <ClCompile Include="..\libavfilter\af_loudnorm.c" />
     <ClCompile Include="..\libavfilter\ebur128.c" />
+    <ClCompile Include="..\libavfilter\af_mcompand.c" />
     <ClCompile Include="..\libavfilter\af_pan.c" />
     <ClCompile Include="..\libavfilter\af_replaygain.c" />
     <ClCompile Include="..\libavfilter\af_silencedetect.c" />

SMP/libavfilter.vcxproj.filters

@@ -348,6 +348,9 @@
     <ClCompile Include="..\libavfilter\ebur128.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\af_mcompand.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\af_pan.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>