projects: Update for recent upstream merge.

SMP/config.asm

@@ -615,6 +615,7 @@
 %define CONFIG_CHOMP_BSF 1
 %define CONFIG_DUMP_EXTRADATA_BSF 1
 %define CONFIG_H264_MP4TOANNEXB_BSF 1
+%define CONFIG_HEVC_MP4TOANNEXB_BSF 1
 %define CONFIG_IMX_DUMP_HEADER_BSF 1
 %define CONFIG_MJPEG2JPEG_BSF 1
 %define CONFIG_MJPEGA_DUMP_HEADER_BSF 1
@@ -701,6 +702,7 @@
 %define CONFIG_H264_VDPAU_DECODER 0
 %define CONFIG_HAP_DECODER 1
 %define CONFIG_HEVC_DECODER 1
+%define CONFIG_HEVC_QSV_DECODER 1
 %define CONFIG_HNM4_VIDEO_DECODER 1
 %define CONFIG_HQ_HQA_DECODER 1
 %define CONFIG_HQX_DECODER 1
@@ -736,6 +738,7 @@
 %define CONFIG_MPEG_VDPAU_DECODER 0
 %define CONFIG_MPEG1_VDPAU_DECODER 0
 %define CONFIG_MPEG2_CRYSTALHD_DECODER 0
+%define CONFIG_MPEG2_QSV_DECODER 1
 %define CONFIG_MSA1_DECODER 1
 %define CONFIG_MSMPEG4_CRYSTALHD_DECODER 0
 %define CONFIG_MSMPEG4V1_DECODER 1
@@ -814,6 +817,7 @@
 %define CONFIG_VC1_CRYSTALHD_DECODER 0
 %define CONFIG_VC1_VDPAU_DECODER 0
 %define CONFIG_VC1IMAGE_DECODER 1
+%define CONFIG_VC1_QSV_DECODER 1
 %define CONFIG_VCR1_DECODER 1
 %define CONFIG_VMDVIDEO_DECODER 1
 %define CONFIG_VMNC_DECODER 1
@@ -1511,6 +1515,7 @@
 %define CONFIG_PAN_FILTER 1
 %define CONFIG_REPLAYGAIN_FILTER 1
 %define CONFIG_RESAMPLE_FILTER 0
+%define CONFIG_SIDECHAINCOMPRESS_FILTER 1
 %define CONFIG_SILENCEDETECT_FILTER 1
 %define CONFIG_SILENCEREMOVE_FILTER 1
 %define CONFIG_TREBLE_FILTER 1
@@ -1692,12 +1697,14 @@
 %define CONFIG_H264_VDPAU_HWACCEL 0
 %define CONFIG_HEVC_D3D11VA_HWACCEL 1
 %define CONFIG_HEVC_DXVA2_HWACCEL 1
+%define CONFIG_HEVC_QSV_HWACCEL 1
 %define CONFIG_HEVC_VDPAU_HWACCEL 0
 %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_QSV_HWACCEL 1
 %define CONFIG_MPEG2_VAAPI_HWACCEL 0
 %define CONFIG_MPEG2_VDPAU_HWACCEL 0
 %define CONFIG_MPEG4_VAAPI_HWACCEL 0
@@ -1706,6 +1713,7 @@
 %define CONFIG_VC1_DXVA2_HWACCEL 1
 %define CONFIG_VC1_VAAPI_HWACCEL 0
 %define CONFIG_VC1_VDPAU_HWACCEL 0
+%define CONFIG_VC1_QSV_HWACCEL 1
 %define CONFIG_WMV3_D3D11VA_HWACCEL 1
 %define CONFIG_WMV3_DXVA2_HWACCEL 1
 %define CONFIG_WMV3_VAAPI_HWACCEL 0

SMP/config.h

@@ -662,6 +662,7 @@
 #define CONFIG_CHOMP_BSF 1
 #define CONFIG_DUMP_EXTRADATA_BSF 1
 #define CONFIG_H264_MP4TOANNEXB_BSF 1
+#define CONFIG_HEVC_MP4TOANNEXB_BSF 1
 #define CONFIG_IMX_DUMP_HEADER_BSF 1
 #define CONFIG_MJPEG2JPEG_BSF 1
 #define CONFIG_MJPEGA_DUMP_HEADER_BSF 1
@@ -748,6 +749,7 @@
 #define CONFIG_H264_VDPAU_DECODER 0
 #define CONFIG_HAP_DECODER 1
 #define CONFIG_HEVC_DECODER 1
+#define CONFIG_HEVC_QSV_DECODER 1
 #define CONFIG_HNM4_VIDEO_DECODER 1
 #define CONFIG_HQ_HQA_DECODER 1
 #define CONFIG_HQX_DECODER 1
@@ -783,6 +785,7 @@
 #define CONFIG_MPEG_VDPAU_DECODER 0
 #define CONFIG_MPEG1_VDPAU_DECODER 0
 #define CONFIG_MPEG2_CRYSTALHD_DECODER 0
+#define CONFIG_MPEG2_QSV_DECODER 1
 #define CONFIG_MSA1_DECODER 1
 #define CONFIG_MSMPEG4_CRYSTALHD_DECODER 0
 #define CONFIG_MSMPEG4V1_DECODER 1
@@ -861,6 +864,7 @@
 #define CONFIG_VC1_CRYSTALHD_DECODER 0
 #define CONFIG_VC1_VDPAU_DECODER 0
 #define CONFIG_VC1IMAGE_DECODER 1
+#define CONFIG_VC1_QSV_DECODER 1
 #define CONFIG_VCR1_DECODER 1
 #define CONFIG_VMDVIDEO_DECODER 1
 #define CONFIG_VMNC_DECODER 1
@@ -1558,6 +1562,7 @@
 #define CONFIG_PAN_FILTER 1
 #define CONFIG_REPLAYGAIN_FILTER 1
 #define CONFIG_RESAMPLE_FILTER 0
+#define CONFIG_SIDECHAINCOMPRESS_FILTER 1
 #define CONFIG_SILENCEDETECT_FILTER 1
 #define CONFIG_SILENCEREMOVE_FILTER 1
 #define CONFIG_TREBLE_FILTER 1
@@ -1739,12 +1744,14 @@
 #define CONFIG_H264_VDPAU_HWACCEL 0
 #define CONFIG_HEVC_D3D11VA_HWACCEL 1
 #define CONFIG_HEVC_DXVA2_HWACCEL 1
+#define CONFIG_HEVC_QSV_HWACCEL 1
 #define CONFIG_HEVC_VDPAU_HWACCEL 0
 #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_QSV_HWACCEL 1
 #define CONFIG_MPEG2_VAAPI_HWACCEL 0
 #define CONFIG_MPEG2_VDPAU_HWACCEL 0
 #define CONFIG_MPEG4_VAAPI_HWACCEL 0
@@ -1753,6 +1760,7 @@
 #define CONFIG_VC1_DXVA2_HWACCEL 1
 #define CONFIG_VC1_VAAPI_HWACCEL 0
 #define CONFIG_VC1_VDPAU_HWACCEL 0
+#define CONFIG_VC1_QSV_HWACCEL 1
 #define CONFIG_WMV3_D3D11VA_HWACCEL 1
 #define CONFIG_WMV3_DXVA2_HWACCEL 1
 #define CONFIG_WMV3_VAAPI_HWACCEL 0

SMP/libavcodec.vcxproj

@@ -816,7 +816,7 @@
     </ClCompile>
     <ClCompile Include="..\libavcodec\h264_slice.c">
     </ClCompile>
-    <ClCompile Include="..\libavcodec\qsvdec_h264.c">
+    <ClCompile Include="..\libavcodec\qsvdec_h2645.c">
     </ClCompile>
     <ClCompile Include="..\libavcodec\qsvenc_h264.c">
     </ClCompile>
@@ -976,6 +976,8 @@
     </ClCompile>
     <ClCompile Include="..\libavcodec\mpeg12enc.c">
     </ClCompile>
+    <ClCompile Include="..\libavcodec\qsvdec_mpeg2.c">
+    </ClCompile>
     <ClCompile Include="..\libavcodec\qsvenc_mpeg2.c">
     </ClCompile>
     <ClCompile Include="..\libavcodec\xvididct.c">
@@ -1283,6 +1285,8 @@
     <ClCompile Include="..\libavcodec\vc1dsp.c">
       <ObjectFileName>$(IntDir)\libavcodec_vc1dsp.obj</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\qsvdec_vc1.c">
+    </ClCompile>
     <ClCompile Include="..\libavcodec\vcr1.c">
     </ClCompile>
     <ClCompile Include="..\libavcodec\vmdaudio.c">
@@ -1558,6 +1562,8 @@
     </ClCompile>
     <ClCompile Include="..\libavcodec\h264_mp4toannexb_bsf.c">
     </ClCompile>
+    <ClCompile Include="..\libavcodec\hevc_mp4toannexb_bsf.c">
+    </ClCompile>
     <ClCompile Include="..\libavcodec\imx_dump_header_bsf.c">
     </ClCompile>
     <ClCompile Include="..\libavcodec\mjpeg2jpeg_bsf.c">

SMP/libavcodec.vcxproj.filters

@@ -1223,7 +1223,7 @@
     <ClCompile Include="..\libavcodec\h264_slice.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavcodec\qsvdec_h264.c">
+    <ClCompile Include="..\libavcodec\qsvdec_h2645.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
     <ClCompile Include="..\libavcodec\qsvenc_h264.c">
@@ -1460,6 +1460,9 @@
     <ClCompile Include="..\libavcodec\mpeg12enc.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\qsvdec_mpeg2.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\qsvenc_mpeg2.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -1910,6 +1913,9 @@
     <ClCompile Include="..\libavcodec\vc1dsp.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\qsvdec_vc1.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\vcr1.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -2318,6 +2324,9 @@
     <ClCompile Include="..\libavcodec\h264_mp4toannexb_bsf.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\hevc_mp4toannexb_bsf.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\imx_dump_header_bsf.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>

SMP/libavfilter.vcxproj

@@ -187,6 +187,8 @@
     </ClCompile>
     <ClCompile Include="..\libavfilter\af_replaygain.c">
     </ClCompile>
+    <ClCompile Include="..\libavfilter\af_sidechaincompress.c">
+    </ClCompile>
     <ClCompile Include="..\libavfilter\af_silencedetect.c">
     </ClCompile>
     <ClCompile Include="..\libavfilter\af_silenceremove.c">
@@ -290,12 +292,12 @@
     </ClCompile>
     <ClCompile Include="..\libavfilter\vf_format.c">
     </ClCompile>
-    <ClCompile Include="..\libavfilter\vf_framestep.c">
-    </ClCompile>
     <ClCompile Include="..\libavfilter\vf_fps.c">
     </ClCompile>
     <ClCompile Include="..\libavfilter\vf_framepack.c">
     </ClCompile>
+    <ClCompile Include="..\libavfilter\vf_framestep.c">
+    </ClCompile>
     <ClCompile Include="..\libavfilter\vf_fspp.c">
       <ObjectFileName>$(IntDir)\libavfilter_vf_fspp.obj</ObjectFileName>
     </ClCompile>

SMP/libavfilter.vcxproj.filters

@@ -233,6 +233,9 @@
     <ClCompile Include="..\libavfilter\af_replaygain.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\af_sidechaincompress.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\af_silencedetect.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
@@ -386,15 +389,15 @@
     <ClCompile Include="..\libavfilter\vf_format.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavfilter\vf_framestep.c">
-      <Filter>Source Files\libavfilter</Filter>
-    </ClCompile>
     <ClCompile Include="..\libavfilter\vf_fps.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
     <ClCompile Include="..\libavfilter\vf_framepack.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\vf_framestep.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\vf_fspp.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>