project: Update for recent upstream merge.

SMP/config.asm

@@ -1684,6 +1684,7 @@
 %define CONFIG_ANULLSRC_FILTER 1
 %define CONFIG_FLITE_FILTER 0
 %define CONFIG_HILBERT_FILTER 1
+%define CONFIG_SINC_FILTER 1
 %define CONFIG_SINE_FILTER 1
 %define CONFIG_ANULLSINK_FILTER 1
 %define CONFIG_ALPHAEXTRACT_FILTER 1
@@ -2180,6 +2181,7 @@
 %define CONFIG_SDS_DEMUXER 1
 %define CONFIG_SDX_DEMUXER 1
 %define CONFIG_SEGAFILM_DEMUXER 1
+%define CONFIG_SER_DEMUXER 1
 %define CONFIG_SHORTEN_DEMUXER 1
 %define CONFIG_SIFF_DEMUXER 1
 %define CONFIG_SLN_DEMUXER 1

SMP/config.h

@@ -1770,6 +1770,7 @@
 #define CONFIG_ANULLSRC_FILTER 1
 #define CONFIG_FLITE_FILTER 0
 #define CONFIG_HILBERT_FILTER 1
+#define CONFIG_SINC_FILTER 1
 #define CONFIG_SINE_FILTER 1
 #define CONFIG_ANULLSINK_FILTER 1
 #define CONFIG_ALPHAEXTRACT_FILTER 1
@@ -2266,6 +2267,7 @@
 #define CONFIG_SDS_DEMUXER 1
 #define CONFIG_SDX_DEMUXER 1
 #define CONFIG_SEGAFILM_DEMUXER 1
+#define CONFIG_SER_DEMUXER 1
 #define CONFIG_SHORTEN_DEMUXER 1
 #define CONFIG_SIFF_DEMUXER 1
 #define CONFIG_SLN_DEMUXER 1

SMP/libavcodec.def

@@ -80,6 +80,7 @@ EXPORTS
     av_mediacodec_default_free
     av_mediacodec_default_init
     av_mediacodec_release_buffer
+    av_mediacodec_render_buffer_at_time
     av_new_packet
     av_packet_add_side_data
     av_packet_alloc

SMP/libavfilter.vcxproj

@@ -204,6 +204,7 @@
     <ClCompile Include="..\libavfilter\asrc_anoisesrc.c" />
     <ClCompile Include="..\libavfilter\asrc_anullsrc.c" />
     <ClCompile Include="..\libavfilter\asrc_hilbert.c" />
+    <ClCompile Include="..\libavfilter\asrc_sinc.c" />
     <ClCompile Include="..\libavfilter\asrc_sine.c" />
     <ClCompile Include="..\libavfilter\asink_anullsink.c" />
     <ClCompile Include="..\libavfilter\vf_extractplanes.c" />

SMP/libavfilter.vcxproj.filters

@@ -435,6 +435,9 @@
     <ClCompile Include="..\libavfilter\asrc_hilbert.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\asrc_sinc.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\asrc_sine.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>

SMP/libavfilter/filter_list.c

@@ -121,6 +121,7 @@ static const AVFilter *filter_list[] = {
     &ff_asrc_anoisesrc,
     &ff_asrc_anullsrc,
     &ff_asrc_hilbert,
+    &ff_asrc_sinc,
     &ff_asrc_sine,
     &ff_asink_anullsink,
     &ff_vf_alphaextract,

SMP/libavformat.vcxproj

@@ -424,6 +424,7 @@
     <ClCompile Include="..\libavformat\segafilm.c" />
     <ClCompile Include="..\libavformat\segafilmenc.c" />
     <ClCompile Include="..\libavformat\segment.c" />
+    <ClCompile Include="..\libavformat\serdec.c" />
     <ClCompile Include="..\libavformat\shortendec.c" />
     <ClCompile Include="..\libavformat\siff.c" />
     <ClCompile Include="..\libavformat\smacker.c" />

SMP/libavformat.vcxproj.filters

@@ -1096,6 +1096,9 @@
     <ClCompile Include="..\libavformat\segment.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavformat\serdec.c">
+      <Filter>Source Files\libavformat</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavformat\shortendec.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>

SMP/libavformat/demuxer_list.c

@@ -226,6 +226,7 @@ static const AVInputFormat *demuxer_list[] = {
     &ff_sds_demuxer,
     &ff_sdx_demuxer,
     &ff_segafilm_demuxer,
+    &ff_ser_demuxer,
     &ff_shorten_demuxer,
     &ff_siff_demuxer,
     &ff_sln_demuxer,