Update ffmpeg patches.

H-M-H · Jun 18, 2020 · 125a716 · 125a716
1 parent 7809b72
commit 125a716
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/deps/awk.patch b/deps/awk.patch
@@ -1,11 +1,11 @@
 diff --git a/configure b/configure
-index 6a7a85cbb9..aa39a76a17 100755
+index 8569a60bf8..928b19db69 100755
 --- a/configure
 +++ b/configure
-@@ -4607,7 +4607,7 @@ probe_cc(){
-     elif $_cc -nologo- 2>&1 | grep -q Microsoft || { $_cc -v 2>&1 | grep -q clang && $_cc -? > /dev/null 2>&1; }; then
-         _type=msvc
-         _ident=$($_cc 2>&1 | head -n1 | tr -d '\r')
+@@ -4690,7 +4690,7 @@ probe_cc(){
+         else
+             _ident=$($_cc --version 2>/dev/null | head -n1 | tr -d '\r')
+         fi
 -        _DEPCMD='$(DEP$(1)) $(DEP$(1)FLAGS) $($(1)DEP_FLAGS) $< 2>&1 | awk '\''/including/ { sub(/^.*file: */, ""); gsub(/\\/, "/"); if (!match($$0, / /)) print "$@:", $$0 }'\'' > $(@:.o=.d)'
 +        _DEPCMD='$(DEP$(1)) $(DEP$(1)FLAGS) $($(1)DEP_FLAGS) $< 2>&1 | awk -f ./msvc_dep.awk > $(@:.o=.d)'
          _DEPFLAGS='$(CPPFLAGS) $(CFLAGS) -showIncludes -Zs'

diff --git a/deps/ffmpeg-x264-static.patch b/deps/ffmpeg-x264-static.patch
@@ -1,10 +1,10 @@
 diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c
-index dc4b4b100d..3615d60f2b 100644
+index d4b1fd0d53..67d161899e 100644
 --- a/libavcodec/libx264.c
 +++ b/libavcodec/libx264.c
-@@ -29,10 +29,6 @@
- #include "avcodec.h"
+@@ -31,10 +31,6 @@
  #include "internal.h"
+ #include "packet_internal.h"
 
 -#if defined(_MSC_VER)
 -#define X264_API_IMPORTS 1