diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-09-21 11:50:53 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-09-21 14:59:23 +0000 |
| commit | d6253f72fc803d23303cd03672be855001f84027 (patch) | |
| tree | da0c4decd164890a52db7465ca28c49c178aa07c | |
| parent | 41100e891fb4b21059aef46c2264873000f46902 (diff) | |
Do not override use_system_ffmpeg
We can use proprietary codecs with system FFMPEG if system FFMPEG is
build with them. If both are set we should trust the configuration.
Change-Id: I702dcdbed4b20405c7affa7af0d87ba446b44ca2
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| -rw-r--r-- | src/core/gyp_run.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/gyp_run.pro b/src/core/gyp_run.pro index bb19a679d..97cb0c0e8 100644 --- a/src/core/gyp_run.pro +++ b/src/core/gyp_run.pro @@ -85,7 +85,7 @@ cross_compile { contains(QT_ARCH, "x86_64"): GYP_ARGS += "-D target_arch=x64" contains(QT_ARCH, "i386"): GYP_ARGS += "-D target_arch=ia32" -contains(WEBENGINE_CONFIG, use_proprietary_codecs): GYP_ARGS += "-Dproprietary_codecs=1 -Dffmpeg_branding=Chrome -Duse_system_ffmpeg=0" +contains(WEBENGINE_CONFIG, use_proprietary_codecs): GYP_ARGS += "-Dproprietary_codecs=1 -Dffmpeg_branding=Chrome" !contains(QT_CONFIG, qt_framework): contains(QT_CONFIG, private_tests) { GYP_ARGS += "-D qt_install_data=\"$$[QT_INSTALL_DATA/get]\"" |