diff --git a/.github/workflows/build-ffmpeg.yml b/.github/workflows/build-ffmpeg.yml index 17cb0fc8..10966d3a 100644 --- a/.github/workflows/build-ffmpeg.yml +++ b/.github/workflows/build-ffmpeg.yml @@ -314,6 +314,7 @@ jobs: git apply -v --ignore-whitespace ../../ffmpeg_patches/ffmpeg/03-amfenc-disable-buffering.patch git apply -v --ignore-whitespace ../../ffmpeg_patches/ffmpeg/04-mfenc-lowlatency.patch git apply -v --ignore-whitespace ../../ffmpeg_patches/ffmpeg/05-amfenc-new-av1-usages.patch + git apply -v --ignore-whitespace ../../ffmpeg_patches/ffmpeg/06-prevent-avcodec-dup-symbols.patch - name: Setup cross compilation id: cross diff --git a/ffmpeg_patches/ffmpeg/06-prevent-avcodec-dup-symbols.patch b/ffmpeg_patches/ffmpeg/06-prevent-avcodec-dup-symbols.patch new file mode 100644 index 00000000..d452fdb4 --- /dev/null +++ b/ffmpeg_patches/ffmpeg/06-prevent-avcodec-dup-symbols.patch @@ -0,0 +1,31 @@ +Subject: [PATCH] trying to patch ffmpeg +--- +Index: libavcodec/mf_utils.h +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/libavcodec/mf_utils.h b/libavcodec/mf_utils.h +--- a/libavcodec/mf_utils.h (revision 41f32f0bc42490c007920cf7b844f7a84852b201) ++++ b/libavcodec/mf_utils.h (date 1712917933957) +@@ -21,20 +21,7 @@ + + #include + #include +-#ifdef _MSC_VER +-// The official way of including codecapi (via dshow.h) makes the ICodecAPI +-// interface unavailable in UWP mode, but including icodecapi.h + codecapi.h +-// seems to be equivalent. (These headers conflict with the official way +-// of including it though, through strmif.h via dshow.h. And on mingw, the +-// mf*.h headers below indirectly include strmif.h.) + #include +-#else +-#define NO_DSHOW_STRSAFE +-#include +-// Older versions of mingw-w64 need codecapi.h explicitly included, while newer +-// ones include it implicitly from dshow.h (via uuids.h). +-#include +-#endif + #include + #include + #include