diff options
| author | Val Doroshchuk <valentyn.doroshchuk@qt.io> | 2019-01-08 13:30:25 +0100 |
|---|---|---|
| committer | VaL Doroshchuk <valentyn.doroshchuk@qt.io> | 2019-01-14 09:20:49 +0000 |
| commit | 4eb0a083cbadca2d24d2382e159864b2980e425f (patch) | |
| tree | a57a268908bdcb6f4d8cd54d4ed7bd60525e2c2a /src/multimedia | |
| parent | 509dedc662a46e37a5024ce357978b8cf70b4988 (diff) | |
Windows: Build directshow media player with wmf if available
Removed -mediaplayer-backend configure param.
It allows to build directshow media player together with wmf's one,
if the last is available.
It is useful to switch to another backend without rebuilding.
By default directshow media player will be used.
[ChangeLog][Platform Specific Changes][Windows] Removed
-mediaplayer-backend config param which allowed to build wmf
together with DirectShow.
Task-number: QTBUG-32783
Change-Id: I486a93d9493407af3793cfe338b35daab7c642db
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
Diffstat (limited to 'src/multimedia')
| -rw-r--r-- | src/multimedia/configure.json | 27 |
1 files changed, 2 insertions, 25 deletions
diff --git a/src/multimedia/configure.json b/src/multimedia/configure.json index ba800fac5..b50272424 100644 --- a/src/multimedia/configure.json +++ b/src/multimedia/configure.json @@ -12,9 +12,7 @@ "directshow": { "type": "boolean" }, "wmf": { "type": "boolean" }, "gstreamer": { "type": "optionalString", "values": [ "no", "yes", "0.10", "1.0" ] }, - "pulseaudio": "boolean", - "mediaplayer-backend": { "type": "string", "values": [ "directshow", "wmf" ] }, - "wmf-backend": { "type": "void", "name": "mediaplayer-backend", "value": "wmf" } + "pulseaudio": "boolean" } }, @@ -190,13 +188,6 @@ "condition": "config.win32 && libs.directshow", "output": [ "feature", "privateFeature" ] }, - "directshow-player": { - "label": "DirectShow", - "enable": "input.mediaplayer-backend == 'directshow'", - "disable": "input.mediaplayer-backend == 'wmf'", - "condition": "features.directshow && !features.wmf-player", - "output": [ "privateFeature" ] - }, "evr": { "label": "evr.h", "condition": "config.win32 && tests.evr", @@ -286,13 +277,6 @@ "label": "Windows Media Foundation", "condition": "config.win32 && libs.wmf", "output": [ "privateFeature" ] - }, - "wmf-player": { - "label": "Windows Media Foundation", - "enable": "input.mediaplayer-backend == 'wmf'", - "disable": "input.mediaplayer-backend != 'wmf'", - "condition": "features.wmf", - "output": [ "privateFeature" ] } }, @@ -314,14 +298,7 @@ "avfoundation", "wasapi", "directshow", - "wmf", - { - "message": "Media player backend", - "type": "firstAvailableFeature", - "args": "directshow-player wmf-player", - "condition": "config.win32" - } - + "wmf" ] } ] |