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.

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

Jump to bottom

Fix ffmpeg windres bug #558

Merged
merged 1 commit into from Apr 10, 2021
Merged

Fix ffmpeg windres bug #558

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions cross_compile_ffmpeg.sh
View file
Open in desktop
Expand Up @@ -2306,6 +2306,7 @@ build_ffmpeg() {

cd $output_dir
apply_patch file://$patch_dir/frei0r_load-shared-libraries-dynamically.diff
apply_patch file://$patch_dir/ffmpeg-windres-fix.patch
if [ "$bits_target" != "32" ]; then
#SVT-HEVC
git apply "../SVT-HEVC_git/ffmpeg_plugin/0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch"
Expand Down
13 changes: 13 additions & 0 deletions patches/ffmpeg-windres-fix.patch
View file
Open in desktop
@@ -0,0 +1,13 @@
diff --git a/ffbuild/common.mak b/ffbuild/common.mak
index e070b6b5e2..ab536e157d 100644
--- ffbuild/common.mak
+++ ffbuild/common.mak
@@ -90,7 +90,7 @@ COMPILE_MSA = $(call COMPILE,CC,MSAFLAGS)
-$(if $(ASMSTRIPFLAGS), $(STRIP) $(ASMSTRIPFLAGS) $@)

%.o: %.rc
- $(WINDRES) $(IFLAGS) --preprocessor "$(DEPWINDRES) -E -xc-header -DRC_INVOKED $(CC_DEPFLAGS)" -o $@ $<
+ $(WINDRES) $(IFLAGS) -o $@ $<

%.i: %.c
$(CC) $(CCFLAGS) $(CC_E) $<