project: Update for recent upstream merge.

SMP/config.asm

@@ -1814,6 +1814,8 @@
 %define CONFIG_VC1_VDPAU_HWACCEL 0
 %define CONFIG_VC1_MMAL_HWACCEL 0
 %define CONFIG_VC1_QSV_HWACCEL 1
+%define CONFIG_VP9_D3D11VA_HWACCEL 0
+%define CONFIG_VP9_DXVA2_HWACCEL 0
 %define CONFIG_WMV3_D3D11VA_HWACCEL 1
 %define CONFIG_WMV3_DXVA2_HWACCEL 1
 %define CONFIG_WMV3_VAAPI_HWACCEL 0

SMP/config.h

@@ -1864,6 +1864,8 @@
 #define CONFIG_VC1_VDPAU_HWACCEL 0
 #define CONFIG_VC1_MMAL_HWACCEL 0
 #define CONFIG_VC1_QSV_HWACCEL 1
+#define CONFIG_VP9_D3D11VA_HWACCEL 0
+#define CONFIG_VP9_DXVA2_HWACCEL 0
 #define CONFIG_WMV3_D3D11VA_HWACCEL 1
 #define CONFIG_WMV3_DXVA2_HWACCEL 1
 #define CONFIG_WMV3_VAAPI_HWACCEL 0

SMP/libavcodec.vcxproj

@@ -504,7 +504,9 @@
     <ClCompile Include="..\libavcodec\frwu.c" />
     <ClCompile Include="..\libavcodec\g2meet.c" />
     <ClCompile Include="..\libavcodec\elsdec.c" />
+    <ClCompile Include="..\libavcodec\g723_1dec.c" />
     <ClCompile Include="..\libavcodec\g723_1.c" />
+    <ClCompile Include="..\libavcodec\g723_1enc.c" />
     <ClCompile Include="..\libavcodec\g729dec.c" />
     <ClCompile Include="..\libavcodec\g729postfilter.c" />
     <ClCompile Include="..\libavcodec\gifdec.c" />

SMP/libavcodec.vcxproj.filters

@@ -1182,9 +1182,15 @@
     <ClCompile Include="..\libavcodec\elsdec.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\g723_1dec.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\g723_1.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\g723_1enc.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\g729dec.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>

SMP/libavutil.def

@@ -392,12 +392,14 @@ EXPORTS
     av_tea_crypt
     av_tea_init
     av_tempfile
+    av_thread_message_flush
     av_thread_message_queue_alloc
     av_thread_message_queue_free
     av_thread_message_queue_recv
     av_thread_message_queue_send
     av_thread_message_queue_set_err_recv
     av_thread_message_queue_set_err_send
+    av_thread_message_queue_set_free_func
     av_timecode_adjust_ntsc_framenum2
     av_timecode_check_frame_rate
     av_timecode_get_smpte_from_framenum