Skip to content
This repository was archived by the owner on Oct 25, 2024. It is now read-only.

Fix ffmpeg build issue with x86 no-clang config. #465

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,13 +1,34 @@
From f61466beb53c4c18dc17a39f5f529e4dc6c9b6a3 Mon Sep 17 00:00:00 2001
From 7f13aa4fd2eeae268ea0323aaa94bdea8cc4d354 Mon Sep 17 00:00:00 2001
From: Qiu Jainlin <[email protected]>
Date: Fri, 8 May 2020 13:01:23 +0800
Subject: [PATCH] Fix missing ffmpeg configure item for msvc build

---
chromium/config/Chrome/win-msvc/x64/config.h | 2 ++
ffmpeg_generated.gni | 6 ++++++
2 files changed, 8 insertions(+)
chromium/config/Chrome/win-msvc/ia32/config.h | 2 ++
chromium/config/Chrome/win-msvc/x64/config.h | 2 ++
ffmpeg_generated.gni | 6 ++++++
3 files changed, 10 insertions(+)

diff --git a/chromium/config/Chrome/win-msvc/ia32/config.h b/chromium/config/Chrome/win-msvc/ia32/config.h
index 90497d03b1..911aaf3543 100644
--- a/chromium/config/Chrome/win-msvc/ia32/config.h
+++ b/chromium/config/Chrome/win-msvc/ia32/config.h
@@ -1030,6 +1030,7 @@
#define CONFIG_XMA1_DECODER 0
#define CONFIG_XMA2_DECODER 0
#define CONFIG_PCM_ALAW_DECODER 1
+#define CONFIG_PCM_VIDC_DECODER 0
#define CONFIG_PCM_BLURAY_DECODER 0
#define CONFIG_PCM_DVD_DECODER 0
#define CONFIG_PCM_F16LE_DECODER 0
@@ -1313,6 +1314,7 @@
#define CONFIG_PCM_U24LE_ENCODER 0
#define CONFIG_PCM_U32BE_ENCODER 0
#define CONFIG_PCM_U32LE_ENCODER 0
+#define CONFIG_PCM_VIDC_ENCODER 0
#define CONFIG_ROQ_DPCM_ENCODER 0
#define CONFIG_ADPCM_ADX_ENCODER 0
#define CONFIG_ADPCM_G722_ENCODER 0
diff --git a/chromium/config/Chrome/win-msvc/x64/config.h b/chromium/config/Chrome/win-msvc/x64/config.h
index 359682176a..fbf47ab570 100644
--- a/chromium/config/Chrome/win-msvc/x64/config.h
Expand Down Expand Up @@ -46,5 +67,5 @@ index 95ea908153..ab9cb51ada 100644
ffmpeg_c_sources += [
"libavcodec/mips/aacdec_mips.c",
--
2.24.1.windows.2
2.28.0.windows.1