projects: Update for 7.0.1 merge.

Author: Sibras

SMP/SMP.patch

@@ -1,5 +1,5 @@
 diff --git a/fftools/opt_common.c b/fftools/opt_common.c
-index f5b73c9f2f..672326999b 100644
+index 9d2d5184a0..4f0a8d59ce 100644
 --- a/fftools/opt_common.c
 +++ b/fftools/opt_common.c
 @@ -48,6 +48,9 @@
@@ -13,7 +13,7 @@ index f5b73c9f2f..672326999b 100644
  #include "libavdevice/version.h"
 
 diff --git a/libavcodec/mfenc.c b/libavcodec/mfenc.c
-index 8bb6f1d38d..a9ca24443d 100644
+index 9225692c51..137bb69a06 100644
 --- a/libavcodec/mfenc.c
 +++ b/libavcodec/mfenc.c
 @@ -59,6 +59,10 @@ typedef struct MFContext {
@@ -27,3 +27,42 @@ index 8bb6f1d38d..a9ca24443d 100644
  #define MF_TIMEBASE (AVRational){1, 10000000}
  // Sentinel value only used by us.
  #define MF_INVALID_TIME AV_NOPTS_VALUE
+diff --git a/libavfilter/textutils.c b/libavfilter/textutils.c
+index ef658d04a2..3ecce972f2 100644
+--- a/libavfilter/textutils.c
++++ b/libavfilter/textutils.c
+@@ -30,6 +30,7 @@
+ #include "libavutil/error.h"
+ #include "libavutil/file.h"
+ #include "libavutil/time.h"
++#include "libavutil/time_internal.h"
+ 
+ static int ff_expand_text_function_internal(FFExpandTextContext *expand_text, AVBPrint *bp,
+                                             char *name, unsigned argc, char **argv)
+@@ -189,7 +190,7 @@ int ff_print_pts(void *log_ctx, AVBPrint *bp, double pts, const char *delta,
+         if (!strcmp(fmt, "localtime"))
+             localtime_r(&ms, &tm);
+         else
+-            gmtime_r(&ms, &tm);
++            ff_gmtime_r(&ms, &tm);
+         av_bprint_strftime(bp, av_x_if_null(strftime_fmt, "%Y-%m-%d %H:%M:%S"), &tm);
+     } else {
+         av_log(log_ctx, AV_LOG_ERROR, "Invalid format '%s'\n", fmt);
+@@ -219,7 +220,7 @@ int ff_print_time(void *log_ctx, AVBPrint *bp,
+     if (localtime)
+         localtime_r(&now, &tm);
+     else
+-        tm = *gmtime_r(&now, &tm);
++        tm = *ff_gmtime_r(&now, &tm);
+ 
+     // manually parse format for %N (fractional seconds)
+     begin = fmt;
+diff --git a/libavformat/file_open.c b/libavformat/file_open.c
+index 494a5d37a4..2e13de17d7 100644
+--- a/libavformat/file_open.c
++++ b/libavformat/file_open.c
+@@ -1 +1,4 @@
++#include "config.h"
++#if CONFIG_SHARED
+ #include "libavutil/file_open.c"
++#endif

SMP/libavformat.vcxproj.filters

@@ -1639,6 +1639,11 @@
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
   </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\libavformat\bitstream.c">
+      <Filter>Source Files\libavformat</Filter>
+    </ClCompile>
+  </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\libavformat\dca_sample_rate_tab.c">
       <Filter>Source Files\libavformat</Filter>

SMP/libavformat_files.props

@@ -555,6 +555,14 @@
       <ExcludedFromBuild Condition="'$(Configuration)'=='DebugWinRT'">true</ExcludedFromBuild>
     </ClCompile>
   </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\libavformat\bitstream.c">
+      <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)'=='ReleaseWinRT'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)'=='DebugWinRT'">true</ExcludedFromBuild>
+    </ClCompile>
+  </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\libavformat\dca_sample_rate_tab.c">
       <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>

SMP/libavformat_winrt.vcxproj.filters

@@ -1639,6 +1639,11 @@
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
   </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\libavformat\bitstream.c">
+      <Filter>Source Files\libavformat</Filter>
+    </ClCompile>
+  </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\libavformat\dca_sample_rate_tab.c">
       <Filter>Source Files\libavformat</Filter>

SMP/libavutil/ffversion.h

@@ -21,5 +21,5 @@
 
 #ifndef SMP_LIBAVUTIL_FFVERSION_H
 #define SMP_LIBAVUTIL_FFVERSION_H
-#define FFMPEG_VERSION "7.0"
+#define FFMPEG_VERSION "7.0.1"
 #endif /* SMP_LIBAVUTIL_FFVERSION_H */