projects: Update for recent upstream merge.

SMP/config.asm

@@ -976,6 +976,7 @@
 %define CONFIG_BMV_AUDIO_DECODER 1
 %define CONFIG_COOK_DECODER 1
 %define CONFIG_DCA_DECODER 1
+%define CONFIG_DOLBY_E_DECODER 1
 %define CONFIG_DSD_LSBF_DECODER 1
 %define CONFIG_DSD_MSBF_DECODER 1
 %define CONFIG_DSD_LSBF_PLANAR_DECODER 1
@@ -1375,6 +1376,7 @@
 %define CONFIG_RSO_DEMUXER 1
 %define CONFIG_RTP_DEMUXER 1
 %define CONFIG_RTSP_DEMUXER 1
+%define CONFIG_S337M_DEMUXER 1
 %define CONFIG_SAMI_DEMUXER 1
 %define CONFIG_SAP_DEMUXER 1
 %define CONFIG_SBG_DEMUXER 1

SMP/config.h

@@ -1033,6 +1033,7 @@
 #define CONFIG_BMV_AUDIO_DECODER 1
 #define CONFIG_COOK_DECODER 1
 #define CONFIG_DCA_DECODER 1
+#define CONFIG_DOLBY_E_DECODER 1
 #define CONFIG_DSD_LSBF_DECODER 1
 #define CONFIG_DSD_MSBF_DECODER 1
 #define CONFIG_DSD_LSBF_PLANAR_DECODER 1
@@ -1432,6 +1433,7 @@
 #define CONFIG_RSO_DEMUXER 1
 #define CONFIG_RTP_DEMUXER 1
 #define CONFIG_RTSP_DEMUXER 1
+#define CONFIG_S337M_DEMUXER 1
 #define CONFIG_SAMI_DEMUXER 1
 #define CONFIG_SAP_DEMUXER 1
 #define CONFIG_SBG_DEMUXER 1

SMP/libavcodec.def

@@ -204,6 +204,7 @@ EXPORTS
     avpriv_copy_bits
     avpriv_copy_pce_data
     avpriv_dca_convert_bitstream
+    avpriv_dca_parse_core_frame_header
     avpriv_dnxhd_get_frame_size
     avpriv_dnxhd_get_interlaced
     avpriv_dnxhd_parse_header_prefix

SMP/libavcodec.vcxproj

@@ -411,6 +411,7 @@
     <ClCompile Include="..\libavcodec\dfa.c" />
     <ClCompile Include="..\libavcodec\dnxhddec.c" />
     <ClCompile Include="..\libavcodec\dnxhddata.c" />
+    <ClCompile Include="..\libavcodec\dolby_e.c" />
     <ClCompile Include="..\libavcodec\dpx.c" />
     <ClCompile Include="..\libavcodec\dpxenc.c" />
     <ClCompile Include="..\libavcodec\dsddec.c" />

SMP/libavcodec.vcxproj.filters

@@ -1056,6 +1056,9 @@
     <ClCompile Include="..\libavcodec\dnxhddata.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\dolby_e.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\dpx.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>

SMP/libavdevice.vcxproj

@@ -86,6 +86,7 @@
     <ClCompile Include="..\libavdevice\sdl2.c" />
     <ClCompile Include="..\libavdevice\vfwcap.c" />
     <ClCompile Include="..\libavdevice\libcdio.c" />
+    <ClCompile Include="libavdevice\reverse_wrap.c" />
     <ClCompile Include="libavdevice\dce_defs.c" />
   </ItemGroup>
   <ItemGroup>

SMP/libavdevice.vcxproj.filters

@@ -82,6 +82,9 @@
     <ClCompile Include="..\libavdevice\libcdio.c">
       <Filter>Source Files\libavdevice</Filter>
     </ClCompile>
+    <ClCompile Include="libavdevice\reverse_wrap.c">
+      <Filter>Source Files\libavdevice</Filter>
+    </ClCompile>
     <ClCompile Include="libavdevice\dce_defs.c">
       <Filter>Source Files\libavdevice</Filter>
     </ClCompile>

SMP/libavdevice/reverse_wrap.c

+/** reverse.c file wrapper for libavdevice
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "config.h"
+#if CONFIG_SHARED
+#   include "../../libavdevice/reverse.c"
+#endif
\ No newline at end of file

SMP/libavformat.vcxproj

@@ -398,6 +398,8 @@
     <ClCompile Include="..\libavformat\httpauth.c" />
     <ClCompile Include="..\libavformat\urldecode.c" />
     <ClCompile Include="..\libavformat\rtspenc.c" />
+    <ClCompile Include="..\libavformat\s337m.c" />
+    <ClCompile Include="..\libavformat\spdif.c" />
     <ClCompile Include="..\libavformat\samidec.c" />
     <ClCompile Include="..\libavformat\sapdec.c" />
     <ClCompile Include="..\libavformat\sapenc.c" />
@@ -420,7 +422,6 @@
     <ClCompile Include="..\libavformat\sol.c" />
     <ClCompile Include="..\libavformat\soxdec.c" />
     <ClCompile Include="..\libavformat\soxenc.c" />
-    <ClCompile Include="..\libavformat\spdif.c" />
     <ClCompile Include="..\libavformat\spdifdec.c" />
     <ClCompile Include="..\libavformat\spdifenc.c" />
     <ClCompile Include="..\libavformat\srtdec.c" />

SMP/libavformat.vcxproj.filters

@@ -1018,6 +1018,12 @@
     <ClCompile Include="..\libavformat\rtspenc.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavformat\s337m.c">
+      <Filter>Source Files\libavformat</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libavformat\spdif.c">
+      <Filter>Source Files\libavformat</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavformat\samidec.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
@@ -1084,9 +1090,6 @@
     <ClCompile Include="..\libavformat\soxenc.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavformat\spdif.c">
-      <Filter>Source Files\libavformat</Filter>
-    </ClCompile>
     <ClCompile Include="..\libavformat\spdifdec.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>

SMP/libavutil.def

@@ -485,6 +485,9 @@ EXPORTS
     avpriv_request_sample
     avpriv_scalarproduct_float_c
     avpriv_set_systematic_pal2
+    avpriv_slicethread_create
+    avpriv_slicethread_execute
+    avpriv_slicethread_free
     avpriv_snprintf
     avpriv_solve_lls
     avpriv_strtod

SMP/libavutil.vcxproj

@@ -127,6 +127,7 @@
     <ClCompile Include="..\libavutil\samplefmt.c" />
     <ClCompile Include="..\libavutil\sha.c" />
     <ClCompile Include="..\libavutil\sha512.c" />
+    <ClCompile Include="..\libavutil\slicethread.c" />
     <ClCompile Include="..\libavutil\spherical.c" />
     <ClCompile Include="..\libavutil\stereo3d.c" />
     <ClCompile Include="..\libavutil\threadmessage.c" />

SMP/libavutil.vcxproj.filters

@@ -210,6 +210,9 @@
     <ClCompile Include="..\libavutil\sha512.c">
       <Filter>Source Files\libavutil</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavutil\slicethread.c">
+      <Filter>Source Files\libavutil</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavutil\spherical.c">
       <Filter>Source Files\libavutil</Filter>
     </ClCompile>