fix scripts

This commit is contained in:
Alexander Frick 2024-04-17 08:18:00 -05:00
parent 3715e2d0c8
commit 7d50127c0f
2 changed files with 2 additions and 16 deletions

View File

@ -3100,22 +3100,6 @@ index f81fbe8bbc..2d65b7d8ad 100644
&ff_vp9_parser,
+ &ff_hevc_parser,
NULL };
diff --git a/chromium/scripts/build_ffmpeg.py b/chromium/scripts/build_ffmpeg.py
index d14ae299c1..1f01f7b038 100755
--- a/chromium/scripts/build_ffmpeg.py
+++ b/chromium/scripts/build_ffmpeg.py
@@ -981,9 +981,9 @@ def ConfigureAndBuild(target_arch, target_os, host_os, host_arch, parallel_jobs,
# Google Chrome & ChromeOS specific configuration.
configure_flags['Chrome'].extend([
- '--enable-decoder=aac,h264',
+ '--enable-decoder=aac,h264,hevc',
'--enable-demuxer=aac',
- '--enable-parser=aac,h264',
+ '--enable-parser=aac,h264,hevc',
])
# Google ChromeOS specific configuration.
diff --git a/ffmpeg_generated.gni b/ffmpeg_generated.gni
index 30aa23c288..829faaaf1b 100644
--- a/ffmpeg_generated.gni

View File

@ -57,6 +57,8 @@ cp -v src/build/vs_toolchain.py ${CR_SRC_DIR}/build/ &&
# Add //third_party/libjxl to DEPS
cp -v thorium-libjxl/src/DEPS ${CR_SRC_DIR}/ &&
cp -v thorium-libjxl/src/.gitmodules ${CR_SRC_DIR}/ &&
cp -v thorium-libjxl/src/third_party/.gitignore ${CR_SRC_DIR}/third_party/ &&
cd ${CR_SRC_DIR} &&