summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
m---------src/3rdparty0
-rw-r--r--src/core/config/common.pri2
-rw-r--r--src/core/config/linux.pri2
3 files changed, 3 insertions, 1 deletions
diff --git a/src/3rdparty b/src/3rdparty
-Subproject e429a99705945c1f75e6823e47b41a42232cc80
+Subproject 725c4c950b5fd0cd3d3aa1f9b8f40eadeb439c9
diff --git a/src/core/config/common.pri b/src/core/config/common.pri
index b23625462..f87eca6e5 100644
--- a/src/core/config/common.pri
+++ b/src/core/config/common.pri
@@ -44,6 +44,8 @@ use?(gn) {
gn_args += enable_webrtc=false
}
+ use?(proprietary_codecs): gn_args += proprietary_codecs=true ffmpeg_branding=\"Chrome\"
+
CONFIG(release, debug|release) {
force_debug_info: gn_args += symbol_level=1
else: gn_args += symbol_level=0
diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri
index 1251ae3cf..232cf2ddd 100644
--- a/src/core/config/linux.pri
+++ b/src/core/config/linux.pri
@@ -89,7 +89,7 @@ use?(gn) {
use?(system_snappy): gn_args += use_system_snappy=true
use?(system_vpx): gn_args += use_system_libvpx=true
use?(system_icu): gn_args += use_system_icu=true icu_use_data_file=false
- #use?(system_ffmpeg): gn_args += use_system_ffmpeg=true
+ use?(system_ffmpeg): gn_args += use_system_ffmpeg=true
#use?(system_protobuf): gn_args += use_system_protobuf=true
}
}