project: Update for recent upstream merge.

SMP/config.asm

@@ -854,6 +854,7 @@
 %define CONFIG_VC1_CRYSTALHD_DECODER 0
 %define CONFIG_VC1_VDPAU_DECODER 0
 %define CONFIG_VC1IMAGE_DECODER 1
+%define CONFIG_VC1_MMAL_DECODER 0
 %define CONFIG_VC1_QSV_DECODER 1
 %define CONFIG_VCR1_DECODER 1
 %define CONFIG_VMDVIDEO_DECODER 1
@@ -966,6 +967,8 @@
 %define CONFIG_WMAV2_DECODER 1
 %define CONFIG_WMAVOICE_DECODER 1
 %define CONFIG_WS_SND1_DECODER 1
+%define CONFIG_XMA1_DECODER 1
+%define CONFIG_XMA2_DECODER 1
 %define CONFIG_PCM_ALAW_DECODER 1
 %define CONFIG_PCM_BLURAY_DECODER 1
 %define CONFIG_PCM_DVD_DECODER 1
@@ -1530,6 +1533,7 @@
 %define CONFIG_APAD_FILTER 1
 %define CONFIG_APERMS_FILTER 1
 %define CONFIG_APHASER_FILTER 1
+%define CONFIG_AREALTIME_FILTER 1
 %define CONFIG_ARESAMPLE_FILTER 1
 %define CONFIG_AREVERSE_FILTER 1
 %define CONFIG_ASELECT_FILTER 1
@@ -1541,7 +1545,6 @@
 %define CONFIG_ASHOWINFO_FILTER 1
 %define CONFIG_ASPLIT_FILTER 1
 %define CONFIG_ASTATS_FILTER 1
-%define CONFIG_ASTREAMSYNC_FILTER 1
 %define CONFIG_ASYNCTS_FILTER 0
 %define CONFIG_ATEMPO_FILTER 1
 %define CONFIG_ATRIM_FILTER 1
@@ -1684,6 +1687,7 @@
 %define CONFIG_PULLUP_FILTER 1
 %define CONFIG_QP_FILTER 1
 %define CONFIG_RANDOM_FILTER 1
+%define CONFIG_REALTIME_FILTER 1
 %define CONFIG_REMOVEGRAIN_FILTER 1
 %define CONFIG_REMOVELOGO_FILTER 1
 %define CONFIG_REPEATFIELDS_FILTER 1
@@ -1749,6 +1753,7 @@
 %define CONFIG_SMPTEBARS_FILTER 1
 %define CONFIG_SMPTEHDBARS_FILTER 1
 %define CONFIG_TESTSRC_FILTER 1
+%define CONFIG_TESTSRC2_FILTER 1
 %define CONFIG_NULLSINK_FILTER 1
 %define CONFIG_ADRAWGRAPH_FILTER 1
 %define CONFIG_APHASEMETER_FILTER 1
@@ -1796,6 +1801,7 @@
 %define CONFIG_VC1_DXVA2_HWACCEL 1
 %define CONFIG_VC1_VAAPI_HWACCEL 0
 %define CONFIG_VC1_VDPAU_HWACCEL 0
+%define CONFIG_VC1_MMAL_HWACCEL 0
 %define CONFIG_VC1_QSV_HWACCEL 1
 %define CONFIG_WMV3_D3D11VA_HWACCEL 1
 %define CONFIG_WMV3_DXVA2_HWACCEL 1

SMP/config.h

@@ -904,6 +904,7 @@
 #define CONFIG_VC1_CRYSTALHD_DECODER 0
 #define CONFIG_VC1_VDPAU_DECODER 0
 #define CONFIG_VC1IMAGE_DECODER 1
+#define CONFIG_VC1_MMAL_DECODER 0
 #define CONFIG_VC1_QSV_DECODER 1
 #define CONFIG_VCR1_DECODER 1
 #define CONFIG_VMDVIDEO_DECODER 1
@@ -1016,6 +1017,8 @@
 #define CONFIG_WMAV2_DECODER 1
 #define CONFIG_WMAVOICE_DECODER 1
 #define CONFIG_WS_SND1_DECODER 1
+#define CONFIG_XMA1_DECODER 1
+#define CONFIG_XMA2_DECODER 1
 #define CONFIG_PCM_ALAW_DECODER 1
 #define CONFIG_PCM_BLURAY_DECODER 1
 #define CONFIG_PCM_DVD_DECODER 1
@@ -1580,6 +1583,7 @@
 #define CONFIG_APAD_FILTER 1
 #define CONFIG_APERMS_FILTER 1
 #define CONFIG_APHASER_FILTER 1
+#define CONFIG_AREALTIME_FILTER 1
 #define CONFIG_ARESAMPLE_FILTER 1
 #define CONFIG_AREVERSE_FILTER 1
 #define CONFIG_ASELECT_FILTER 1
@@ -1591,7 +1595,6 @@
 #define CONFIG_ASHOWINFO_FILTER 1
 #define CONFIG_ASPLIT_FILTER 1
 #define CONFIG_ASTATS_FILTER 1
-#define CONFIG_ASTREAMSYNC_FILTER 1
 #define CONFIG_ASYNCTS_FILTER 0
 #define CONFIG_ATEMPO_FILTER 1
 #define CONFIG_ATRIM_FILTER 1
@@ -1734,6 +1737,7 @@
 #define CONFIG_PULLUP_FILTER 1
 #define CONFIG_QP_FILTER 1
 #define CONFIG_RANDOM_FILTER 1
+#define CONFIG_REALTIME_FILTER 1
 #define CONFIG_REMOVEGRAIN_FILTER 1
 #define CONFIG_REMOVELOGO_FILTER 1
 #define CONFIG_REPEATFIELDS_FILTER 1
@@ -1799,6 +1803,7 @@
 #define CONFIG_SMPTEBARS_FILTER 1
 #define CONFIG_SMPTEHDBARS_FILTER 1
 #define CONFIG_TESTSRC_FILTER 1
+#define CONFIG_TESTSRC2_FILTER 1
 #define CONFIG_NULLSINK_FILTER 1
 #define CONFIG_ADRAWGRAPH_FILTER 1
 #define CONFIG_APHASEMETER_FILTER 1
@@ -1846,6 +1851,7 @@
 #define CONFIG_VC1_DXVA2_HWACCEL 1
 #define CONFIG_VC1_VAAPI_HWACCEL 0
 #define CONFIG_VC1_VDPAU_HWACCEL 0
+#define CONFIG_VC1_MMAL_HWACCEL 0
 #define CONFIG_VC1_QSV_HWACCEL 1
 #define CONFIG_WMV3_D3D11VA_HWACCEL 1
 #define CONFIG_WMV3_DXVA2_HWACCEL 1

SMP/libavfilter.vcxproj

@@ -119,6 +119,7 @@
     <ClCompile Include="..\libavfilter\f_perms.c" />
     <ClCompile Include="..\libavfilter\af_aphaser.c" />
     <ClCompile Include="..\libavfilter\generate_wave_table.c" />
+    <ClCompile Include="..\libavfilter\f_realtime.c" />
     <ClCompile Include="..\libavfilter\af_aresample.c" />
     <ClCompile Include="..\libavfilter\f_reverse.c" />
     <ClCompile Include="..\libavfilter\f_select.c" />
@@ -130,7 +131,6 @@
     <ClCompile Include="..\libavfilter\af_ashowinfo.c" />
     <ClCompile Include="..\libavfilter\split.c" />
     <ClCompile Include="..\libavfilter\af_astats.c" />
-    <ClCompile Include="..\libavfilter\af_astreamsync.c" />
     <ClCompile Include="..\libavfilter\af_atempo.c" />
     <ClCompile Include="..\libavfilter\trim.c" />
     <ClCompile Include="..\libavfilter\af_channelmap.c" />

SMP/libavfilter.vcxproj.filters

@@ -177,6 +177,9 @@
     <ClCompile Include="..\libavfilter\generate_wave_table.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\f_realtime.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\af_aresample.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
@@ -210,9 +213,6 @@
     <ClCompile Include="..\libavfilter\af_astats.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavfilter\af_astreamsync.c">
-      <Filter>Source Files\libavfilter</Filter>
-    </ClCompile>
     <ClCompile Include="..\libavfilter\af_atempo.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>