diff options
| author | Lorn Potter <lorn.potter@nokia.com> | 2010-03-06 20:30:28 (GMT) |
|---|---|---|
| committer | Lorn Potter <lorn.potter@nokia.com> | 2010-03-06 20:30:28 (GMT) |
| commit | 670b1cfccd68a69e03544adff5dea1a21dc2b339 (patch) | |
| tree | a4d9f87d690182e14facf41db34c999600bade96 /src/3rdparty | |
| parent | 35e939a0c9afb29f82e2aba774a117a35ea83a17 (diff) | |
| parent | 64c024d4ef4d80af8f728a684b34057824dcf322 (diff) | |
| download | Qt-670b1cfccd68a69e03544adff5dea1a21dc2b339.zip Qt-670b1cfccd68a69e03544adff5dea1a21dc2b339.tar.gz Qt-670b1cfccd68a69e03544adff5dea1a21dc2b339.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/phonon/ds9/backendnode.cpp | 2 | ||||
| -rw-r--r-- | src/3rdparty/phonon/ds9/videorenderer_soft.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/phonon/ds9/backendnode.cpp b/src/3rdparty/phonon/ds9/backendnode.cpp index 3afcafa..737ab7b 100644 --- a/src/3rdparty/phonon/ds9/backendnode.cpp +++ b/src/3rdparty/phonon/ds9/backendnode.cpp @@ -67,7 +67,7 @@ namespace Phonon if (info.pGraph) { HRESULT hr = info.pGraph->RemoveFilter(filter); - if (hr == VFW_E_NOT_STOPPED && m_mediaObject) { + if (FAILED(hr) && m_mediaObject) { m_mediaObject->ensureStopped(); hr = info.pGraph->RemoveFilter(filter); diff --git a/src/3rdparty/phonon/ds9/videorenderer_soft.cpp b/src/3rdparty/phonon/ds9/videorenderer_soft.cpp index f7d42cf..9c7993c 100644 --- a/src/3rdparty/phonon/ds9/videorenderer_soft.cpp +++ b/src/3rdparty/phonon/ds9/videorenderer_soft.cpp @@ -45,7 +45,7 @@ along with this library. If not, see <http://www.gnu.org/licenses/>. #endif #ifndef QT_NO_OPENGL -#include <gl/gl.h> +#include <GL/gl.h> #ifndef GL_FRAGMENT_PROGRAM_ARB #define GL_FRAGMENT_PROGRAM_ARB 0x8804 #define GL_PROGRAM_FORMAT_ASCII_ARB 0x8875 |