Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enabled AC3,EAC3 and SWR #311

Closed
wants to merge 2 commits into from
Closed

Enabled AC3,EAC3 and SWR #311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
43062f4
enabled ac3,eac3 and swresample
mariotaku Apr 12, 2024
1d9a59a
patch ffmpeg to prevent redefined symbols in strmiids
mariotaku Apr 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/build-ffmpeg.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -547,6 +548,7 @@ jobs:
--disable-autodetect \
--disable-iconv \
--enable-avcodec \
--enable-encoder=ac3,eac3 \
--enable-encoder=libsvtav1 \
--enable-encoder=libx264,libx265 \
--enable-gpl \
Expand All @@ -555,6 +557,7 @@ jobs:
--enable-libx265 \
--enable-static \
--enable-swscale \
--enable-swresample \
--pkg-config=pkg-config \
${{ matrix.ffmpeg_extras }} \
|| config_error=true
Expand Down
31 changes: 31 additions & 0 deletions ffmpeg_patches/ffmpeg/06-prevent-avcodec-dup-symbols.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 <windows.h>
#include <initguid.h>
-#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 <icodecapi.h>
-#else
-#define NO_DSHOW_STRSAFE
-#include <dshow.h>
-// Older versions of mingw-w64 need codecapi.h explicitly included, while newer
-// ones include it implicitly from dshow.h (via uuids.h).
-#include <codecapi.h>
-#endif
#include <mfapi.h>
#include <mferror.h>
#include <mfobjects.h>