adapt scripts for new ffmpeg

epel9
Than Ngo 4 months ago
parent a9002f8e77
commit cbb6b50391

@ -138,6 +138,7 @@ header_files=" libavcodec/x86/inline_asm.h \
libavcodec/pixels.h \ libavcodec/pixels.h \
libavcodec/png.h \ libavcodec/png.h \
libavcodec/pngdsp.h \ libavcodec/pngdsp.h \
libavcodec/progressframe.h \
libavcodec/put_bits.h \ libavcodec/put_bits.h \
libavcodec/qpeldsp.h \ libavcodec/qpeldsp.h \
libavcodec/ratecontrol.h \ libavcodec/ratecontrol.h \

@ -1,10 +1,13 @@
diff -up third_party/ffmpeg/ffmpeg_generated.gni.me third_party/ffmpeg/ffmpeg_generated.gni diff -up third_party/ffmpeg/ffmpeg_generated.gni.me third_party/ffmpeg/ffmpeg_generated.gni
--- third_party/ffmpeg/ffmpeg_generated.gni.me 2024-05-05 00:45:53.017100841 +0200 --- third_party/ffmpeg/ffmpeg_generated.gni.me 2024-07-19 23:49:33.776963768 +0200
+++ third_party/ffmpeg/ffmpeg_generated.gni 2024-05-05 00:46:20.244559951 +0200 +++ third_party/ffmpeg/ffmpeg_generated.gni 2024-07-19 23:50:14.377819007 +0200
@@ -17,8 +17,8 @@ use_linux_config = is_linux || is_chrome @@ -14,10 +14,10 @@ ffmpeg_asm_sources = []
if ((is_android && current_cpu == "arm" && arm_use_neon) ||
(is_android && current_cpu == "arm64") || use_linux_config = is_linux || is_chromeos || is_fuchsia
(is_android && current_cpu == "x64") ||
-if (current_cpu == "arm64" || current_cpu == "x64" ||
+if ((current_cpu == "arm64") || (current_cpu == "x64") ||
(is_android && current_cpu == "arm" && arm_use_neon) ||
- (is_android && current_cpu == "x86") || is_apple || is_win || - (is_android && current_cpu == "x86") || is_apple || is_win ||
- use_linux_config) { - use_linux_config) {
+ (is_android && current_cpu == "x86") || (is_apple) || (is_win) || + (is_android && current_cpu == "x86") || (is_apple) || (is_win) ||

Loading…
Cancel
Save