project: Update for recent upstream merge.

SMP/config.asm

@@ -768,6 +768,7 @@
 %define CONFIG_MPEGVIDEO_DECODER 1
 %define CONFIG_MPEG_VDPAU_DECODER 0
 %define CONFIG_MPEG1_VDPAU_DECODER 0
+%define CONFIG_MPEG2_MMAL_DECODER 0
 %define CONFIG_MPEG2_CRYSTALHD_DECODER 0
 %define CONFIG_MPEG2_QSV_DECODER 1
 %define CONFIG_MSA1_DECODER 1
@@ -1691,6 +1692,7 @@
 %define CONFIG_SETTB_FILTER 1
 %define CONFIG_SHOWINFO_FILTER 1
 %define CONFIG_SHOWPALETTE_FILTER 1
+%define CONFIG_SHUFFLEFRAMES_FILTER 1
 %define CONFIG_SHUFFLEPLANES_FILTER 1
 %define CONFIG_SIGNALSTATS_FILTER 1
 %define CONFIG_SMARTBLUR_FILTER 1
@@ -1772,6 +1774,7 @@
 %define CONFIG_MPEG2_XVMC_HWACCEL 0
 %define CONFIG_MPEG2_D3D11VA_HWACCEL 1
 %define CONFIG_MPEG2_DXVA2_HWACCEL 1
+%define CONFIG_MPEG2_MMAL_HWACCEL 0
 %define CONFIG_MPEG2_QSV_HWACCEL 1
 %define CONFIG_MPEG2_VAAPI_HWACCEL 0
 %define CONFIG_MPEG2_VDPAU_HWACCEL 0

SMP/config.h

@@ -818,6 +818,7 @@
 #define CONFIG_MPEGVIDEO_DECODER 1
 #define CONFIG_MPEG_VDPAU_DECODER 0
 #define CONFIG_MPEG1_VDPAU_DECODER 0
+#define CONFIG_MPEG2_MMAL_DECODER 0
 #define CONFIG_MPEG2_CRYSTALHD_DECODER 0
 #define CONFIG_MPEG2_QSV_DECODER 1
 #define CONFIG_MSA1_DECODER 1
@@ -1741,6 +1742,7 @@
 #define CONFIG_SETTB_FILTER 1
 #define CONFIG_SHOWINFO_FILTER 1
 #define CONFIG_SHOWPALETTE_FILTER 1
+#define CONFIG_SHUFFLEFRAMES_FILTER 1
 #define CONFIG_SHUFFLEPLANES_FILTER 1
 #define CONFIG_SIGNALSTATS_FILTER 1
 #define CONFIG_SMARTBLUR_FILTER 1
@@ -1822,6 +1824,7 @@
 #define CONFIG_MPEG2_XVMC_HWACCEL 0
 #define CONFIG_MPEG2_D3D11VA_HWACCEL 1
 #define CONFIG_MPEG2_DXVA2_HWACCEL 1
+#define CONFIG_MPEG2_MMAL_HWACCEL 0
 #define CONFIG_MPEG2_QSV_HWACCEL 1
 #define CONFIG_MPEG2_VAAPI_HWACCEL 0
 #define CONFIG_MPEG2_VDPAU_HWACCEL 0

SMP/libavfilter.vcxproj

@@ -429,6 +429,8 @@
     </ClCompile>
     <ClCompile Include="..\libavfilter\vf_showpalette.c">
     </ClCompile>
+    <ClCompile Include="..\libavfilter\vf_shuffleframes.c">
+    </ClCompile>
     <ClCompile Include="..\libavfilter\vf_shuffleplanes.c">
     </ClCompile>
     <ClCompile Include="..\libavfilter\vf_signalstats.c">

SMP/libavfilter.vcxproj.filters

@@ -584,6 +584,9 @@
     <ClCompile Include="..\libavfilter\vf_showpalette.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\vf_shuffleframes.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\vf_shuffleplanes.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>