projects: Update for recent upstream merge.

SMP/config.asm

@@ -1488,6 +1488,7 @@
 %define CONFIG_MOVTEXT_ENCODER 1
 %define CONFIG_SRT_ENCODER 1
 %define CONFIG_SUBRIP_ENCODER 1
+%define CONFIG_TEXT_ENCODER 1
 %define CONFIG_WEBVTT_ENCODER 1
 %define CONFIG_XSUB_ENCODER 1
 %define CONFIG_LIBFAAC_ENCODER 0

SMP/config.h

@@ -1538,6 +1538,7 @@
 #define CONFIG_MOVTEXT_ENCODER 1
 #define CONFIG_SRT_ENCODER 1
 #define CONFIG_SUBRIP_ENCODER 1
+#define CONFIG_TEXT_ENCODER 1
 #define CONFIG_WEBVTT_ENCODER 1
 #define CONFIG_XSUB_ENCODER 1
 #define CONFIG_LIBFAAC_ENCODER 0

SMP/libavutil.vcxproj

@@ -145,9 +145,9 @@
     <ClCompile Include="..\libavutil\xtea.c" />
     <ClCompile Include="..\libavutil\tea.c" />
     <ClCompile Include="..\libavutil\lzo.c" />
-    <ClCompile Include="..\libavutil\..\compat\msvcrt\snprintf.c" />
-    <ClCompile Include="..\libavutil\..\compat\strtod.c" />
-    <ClCompile Include="..\libavutil\..\compat\getopt.c" />
+    <ClCompile Include="..\compat\msvcrt\snprintf.c" />
+    <ClCompile Include="..\compat\strtod.c" />
+    <ClCompile Include="..\compat\getopt.c" />
     <ClCompile Include="..\libavutil\x86\cpu.c">
       <ObjectFileName>$(IntDir)\libavutil_x86_cpu.obj</ObjectFileName>
     </ClCompile>

SMP/libavutil.vcxproj.filters

@@ -243,13 +243,13 @@
     <ClCompile Include="..\libavutil\lzo.c">
       <Filter>Source Files\libavutil</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavutil\..\compat\msvcrt\snprintf.c">
+    <ClCompile Include="..\compat\msvcrt\snprintf.c">
       <Filter>Source Files\compat\msvcrt</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavutil\..\compat\strtod.c">
+    <ClCompile Include="..\compat\strtod.c">
       <Filter>Source Files\compat</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavutil\..\compat\getopt.c">
+    <ClCompile Include="..\compat\getopt.c">
       <Filter>Source Files\compat</Filter>
     </ClCompile>
     <ClCompile Include="..\libavutil\x86\cpu.c">