projects: Update for recent upstream merge.

SMP/config.asm

@@ -778,6 +778,7 @@
 %define CONFIG_MPEG2VIDEO_DECODER 1
 %define CONFIG_MPEG4_DECODER 1
 %define CONFIG_MPEG4_CRYSTALHD_DECODER 0
+%define CONFIG_MPEG4_MMAL_DECODER 0
 %define CONFIG_MPEG4_VDPAU_DECODER 0
 %define CONFIG_MPEGVIDEO_DECODER 1
 %define CONFIG_MPEG_VDPAU_DECODER 0
@@ -1823,6 +1824,7 @@
 %define CONFIG_MPEG2_VAAPI_HWACCEL 0
 %define CONFIG_MPEG2_VDPAU_HWACCEL 0
 %define CONFIG_MPEG2_VIDEOTOOLBOX_HWACCEL 0
+%define CONFIG_MPEG4_MMAL_HWACCEL 0
 %define CONFIG_MPEG4_VAAPI_HWACCEL 0
 %define CONFIG_MPEG4_VDPAU_HWACCEL 0
 %define CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL 0
@@ -2027,6 +2029,7 @@
 %define CONFIG_DIRAC_PARSER 1
 %define CONFIG_DNXHD_PARSER 1
 %define CONFIG_DPX_PARSER 1
+%define CONFIG_DVAUDIO_PARSER 1
 %define CONFIG_DVBSUB_PARSER 1
 %define CONFIG_DVDSUB_PARSER 1
 %define CONFIG_DVD_NAV_PARSER 1

SMP/config.h

@@ -828,6 +828,7 @@
 #define CONFIG_MPEG2VIDEO_DECODER 1
 #define CONFIG_MPEG4_DECODER 1
 #define CONFIG_MPEG4_CRYSTALHD_DECODER 0
+#define CONFIG_MPEG4_MMAL_DECODER 0
 #define CONFIG_MPEG4_VDPAU_DECODER 0
 #define CONFIG_MPEGVIDEO_DECODER 1
 #define CONFIG_MPEG_VDPAU_DECODER 0
@@ -1873,6 +1874,7 @@
 #define CONFIG_MPEG2_VAAPI_HWACCEL 0
 #define CONFIG_MPEG2_VDPAU_HWACCEL 0
 #define CONFIG_MPEG2_VIDEOTOOLBOX_HWACCEL 0
+#define CONFIG_MPEG4_MMAL_HWACCEL 0
 #define CONFIG_MPEG4_VAAPI_HWACCEL 0
 #define CONFIG_MPEG4_VDPAU_HWACCEL 0
 #define CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL 0
@@ -2087,6 +2089,7 @@
 #define CONFIG_DIRAC_PARSER 1
 #define CONFIG_DNXHD_PARSER 1
 #define CONFIG_DPX_PARSER 1
+#define CONFIG_DVAUDIO_PARSER 1
 #define CONFIG_DVBSUB_PARSER 1
 #define CONFIG_DVDSUB_PARSER 1
 #define CONFIG_DVD_NAV_PARSER 1

SMP/libavcodec.vcxproj

@@ -916,6 +916,7 @@
     <ClCompile Include="..\libavcodec\dirac_parser.c" />
     <ClCompile Include="..\libavcodec\dnxhd_parser.c" />
     <ClCompile Include="..\libavcodec\dpx_parser.c" />
+    <ClCompile Include="..\libavcodec\dvaudio_parser.c" />
     <ClCompile Include="..\libavcodec\dvbsub_parser.c" />
     <ClCompile Include="..\libavcodec\dvd_nav_parser.c" />
     <ClCompile Include="..\libavcodec\dvdsub_parser.c" />

SMP/libavcodec.vcxproj.filters

@@ -2334,6 +2334,9 @@
     <ClCompile Include="..\libavcodec\dpx_parser.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\dvaudio_parser.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\dvbsub_parser.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>