diff options
| author | Andrew den Exter <andrew.den-exter@nokia.com> | 2010-04-16 06:03:10 (GMT) |
|---|---|---|
| committer | Andrew den Exter <andrew.den-exter@nokia.com> | 2010-04-16 06:06:56 (GMT) |
| commit | 9471428742ba59dbb174fc275742052e4bb629ff (patch) | |
| tree | cf9455a89effc6135d08c34c14df73bc3351efa2 | |
| parent | 83a8523c9a33ccfadb8a06d5043b6e713330ff03 (diff) | |
| download | Qt-9471428742ba59dbb174fc275742052e4bb629ff.zip Qt-9471428742ba59dbb174fc275742052e4bb629ff.tar.gz Qt-9471428742ba59dbb174fc275742052e4bb629ff.tar.bz2 | |
Fix compile errors in Direct Show media service.
The service links against the multimedia library in addition to the
mediaservices libarary, and QAbstractVideoSurface is defined in
QtMultimedia, no QtMediaServices.
| -rw-r--r-- | src/plugins/mediaservices/directshow/directshow.pro | 2 | ||||
| -rw-r--r-- | src/plugins/mediaservices/directshow/mediaplayer/mediasamplevideobuffer.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/mediaservices/directshow/directshow.pro b/src/plugins/mediaservices/directshow/directshow.pro index 973c2b1..065e391 100644 --- a/src/plugins/mediaservices/directshow/directshow.pro +++ b/src/plugins/mediaservices/directshow/directshow.pro @@ -1,7 +1,7 @@ TARGET = qdsengine include(../../qpluginbase.pri) -QT += mediaservices +QT += multimedia mediaservices HEADERS += dsserviceplugin.h SOURCES += dsserviceplugin.cpp diff --git a/src/plugins/mediaservices/directshow/mediaplayer/mediasamplevideobuffer.h b/src/plugins/mediaservices/directshow/mediaplayer/mediasamplevideobuffer.h index 1b3776d..06dc31c 100644 --- a/src/plugins/mediaservices/directshow/mediaplayer/mediasamplevideobuffer.h +++ b/src/plugins/mediaservices/directshow/mediaplayer/mediasamplevideobuffer.h @@ -42,7 +42,7 @@ #ifndef MEDIASAMPLEVIDEOBUFFER_H #define MEDIASAMPLEVIDEOBUFFER_H -#include <QtMediaServices/qabstractvideobuffer.h> +#include <QtMultimedia/qabstractvideobuffer.h> #include <dshow.h> |