diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-03-06 13:36:50 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-03-08 10:10:20 +0000 |
| commit | a0e0cbc1f39aa25d372a9468014f2a3dd585959b (patch) | |
| tree | b865f44e7f5a9418fde91c1755ff3effc31a172b /src/core | |
| parent | dc3eab2af2a7da6a896f5b2391254c609a14b8ff (diff) | |
Enable FFMPEG configuration for GN
Enables proprietary codecs and using system FFMPEG
Pulls in Chromium changes:
725c4c9 Optionally link with system ffmpeg
Change-Id: Id7b3379c99a709348bf8684f78e44b41169a1e5a
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/config/common.pri | 2 | ||||
| -rw-r--r-- | src/core/config/linux.pri | 2 |
2 files changed, 3 insertions, 1 deletions
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 } } |