summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-02-18 14:58:16 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-02-18 14:58:16 (GMT)
commit50fe29b569849d05db1625fa30fbd8618a941c5a (patch)
treef30a6a1600c63e788aca29b71ca07bec2c554b47 /src/3rdparty
parentc18beac8163634b48bbf1e7280923e96f5ef0a51 (diff)
parent7c2ccecd96631caf290e070f9e34bbe54be275ce (diff)
downloadQt-50fe29b569849d05db1625fa30fbd8618a941c5a.zip
Qt-50fe29b569849d05db1625fa30fbd8618a941c5a.tar.gz
Qt-50fe29b569849d05db1625fa30fbd8618a941c5a.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-team: (90 commits) Switch RGB24 and BGR24 shaders back. Disable the full screen video widget tests on X11. Use the IPropertyBag interface to get audio device names. Fix qmlgraphicsvideo.pro Add qmlgraphicsvideo test to auto.pro Fix QMediaServiceProvider test. Make QMediaPlaylist test pass. Fix QMediaPlayer test failure. Fix qmlaudio.pro. Make QMediaPlayer test compile. Remove tests not relevant to playback functionality. Remove tests that depend on playlist plugins. Support YUV444 formats in QPainterVideoSurface. Add qmlaudio test to auto.pro Fix license headers. Remove unused files. Extend the mappings between Direct Show and QVideoFrame color formats. Don't paint RGB24 frames as BGR24. Added multimedia to qmlviewer Fixed compile error in pulseaudio soundeffect implementation ...
Diffstat (limited to 'src/3rdparty')
0 files changed, 0 insertions, 0 deletions