diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-13 11:02:04 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-13 11:02:04 +0200 |
| commit | 49461f9cffa5439e536a844ec3a0134c252141e6 (patch) | |
| tree | 3d645b3c8fe5d9b374c6df8e12705ee090596d42 /src/plugins/directshow | |
| parent | 7b0cae6c4f9f417e14a1553cd206bd929d299dbb (diff) | |
| parent | 08e13bfcdb23eabfbc47bca7499b0b8aadce0ac7 (diff) | |
| download | qtmultimedia-49461f9cffa5439e536a844ec3a0134c252141e6.tar.gz | |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: I773db005bbdc511169917ee35eb5b517e898926b
Diffstat (limited to 'src/plugins/directshow')
| -rw-r--r-- | src/plugins/directshow/player/directshowplayerservice.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/plugins/directshow/player/directshowplayerservice.cpp b/src/plugins/directshow/player/directshowplayerservice.cpp index a411715b8..d0c342ed4 100644 --- a/src/plugins/directshow/player/directshowplayerservice.cpp +++ b/src/plugins/directshow/player/directshowplayerservice.cpp @@ -67,6 +67,7 @@ #include <QtCore/qcoreapplication.h> #include <QtCore/qdatetime.h> +#include <QtCore/qdir.h> #include <QtCore/qthread.h> #include <QtCore/qvarlengtharray.h> @@ -329,8 +330,10 @@ void DirectShowPlayerService::doSetUrlSource(QMutexLocker *locker) if (!SUCCEEDED(hr)) { locker->unlock(); + const QString urlString = m_url.isLocalFile() + ? QDir::toNativeSeparators(m_url.toLocalFile()) : m_url.toString(); hr = m_graph->AddSourceFilter( - reinterpret_cast<const OLECHAR *>(m_url.toString().utf16()), L"Source", &source); + reinterpret_cast<const OLECHAR *>(urlString.utf16()), L"Source", &source); locker->relock(); } |