diff options
author | Michael Goddard <michael.goddard@nokia.com> | 2011-07-25 16:45:09 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-07-25 14:31:41 +0200 |
commit | 1e4dda971098656dad390478601ee932e9c4e3e3 (patch) | |
tree | 7da016aa40fc1a0f356f51eabc5033a32bccc2e4 /src/plugins/directshow | |
parent | e45902822c8161c84d2148244f0ff72fff0ba515 (diff) |
Add Windows Media Foundation backend for QMediaPlayer
Task-number:QTMOBILITY-1606
Reviewed-by: Michael Goddard
(cherry picked from commit bdf3a9b39661cfb836245139d02e95e854646a7e)
(cherry picked from commit 8d2370953eb32bf44a037244e0d9f9b484875f7a)
Change-Id: I07790b8c540a04e4e19a3d018a4884a773e980bf
Reviewed-on: http://codereview.qt.nokia.com/2086
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Ling Hu <ling.hu@nokia.com>
Diffstat (limited to 'src/plugins/directshow')
-rw-r--r-- | src/plugins/directshow/directshow.pro | 2 | ||||
-rw-r--r-- | src/plugins/directshow/dsserviceplugin.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/directshow/directshow.pro b/src/plugins/directshow/directshow.pro index 513f810fb..e2a37e612 100644 --- a/src/plugins/directshow/directshow.pro +++ b/src/plugins/directshow/directshow.pro @@ -19,7 +19,7 @@ SOURCES += dsserviceplugin.cpp !contains(config_test_wmsdk, yes): DEFINES += QT_NO_WMSDK -include (player/player.pri) +contains(config_test_wmf, no): include (player/player.pri) include (camera/camera.pri) target.path += $$[QT_INSTALL_PLUGINS]/$${PLUGIN_TYPE} diff --git a/src/plugins/directshow/dsserviceplugin.cpp b/src/plugins/directshow/dsserviceplugin.cpp index b354d2195..adfb025d8 100644 --- a/src/plugins/directshow/dsserviceplugin.cpp +++ b/src/plugins/directshow/dsserviceplugin.cpp @@ -47,6 +47,7 @@ #ifdef QMEDIA_DIRECTSHOW_CAMERA +#include <dshow.h> #include "dscameraservice.h" #endif |