diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-09-19 16:54:17 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-09-20 09:33:21 +0000 |
| commit | 3b9138ebe86c853ff84edc245f2d331f96ff2e93 (patch) | |
| tree | a96969d75707285946c078383fc934559a5d52f6 | |
| parent | 560a4a616f2a1307385e5e7a7d2e99b0b41775c8 (diff) | |
| download | qtwebengine-chromium-3b9138ebe86c853ff84edc245f2d331f96ff2e93.tar.gz | |
FIXUP: Optionally link with system ffmpeg
Switch to buildflags instead of direct defines.
Change-Id: I347450db42eeab46930798905bb7ea32ee4db3eb
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| -rwxr-xr-x | chromium/third_party/ffmpeg/BUILD.gn | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/chromium/third_party/ffmpeg/BUILD.gn b/chromium/third_party/ffmpeg/BUILD.gn index db473f332b6..ca484e96f0f 100755 --- a/chromium/third_party/ffmpeg/BUILD.gn +++ b/chromium/third_party/ffmpeg/BUILD.gn @@ -152,9 +152,15 @@ config("ffmpegsumo_warnings") { buildflag_header("ffmpeg_features") { header = "ffmpeg_features.h" - flags = [ - "USE_SYSTEM_FFMPEG=false", - ] + if (use_system_ffmpeg) { + flags = [ + "USE_SYSTEM_FFMPEG=true", + ] + } else { + flags = [ + "USE_SYSTEM_FFMPEG=false", + ] + } } if (is_component_ffmpeg) { @@ -444,10 +450,6 @@ if (use_system_ffmpeg) { "opt.h", ] } - - config("use_system_ffmpeg") { - defines = [ "USE_SYSTEM_FFMPEG=1" ] - } } if (is_component_ffmpeg) { @@ -481,7 +483,7 @@ if (is_component_ffmpeg) { } else { source_set("ffmpeg") { if (use_system_ffmpeg) { - public_configs = [ ":system_ffmpeg", ":use_system_ffmpeg" ] + public_configs = [ ":system_ffmpeg" ] deps = [ ":libavcodec_shim", ":libavformat_shim", ":libavutil_shim" ] } else { public_configs = [ ":ffmpeg_dependent_config" ] |