summaryrefslogtreecommitdiffstats
path: root/plugins/multimedia/directshow
Commit message (Expand)AuthorAgeFilesLines
* Update to new license formatSergio Ahumada2012-11-0748-1056/+1056
* Change copyrights from Nokia to DigiaSergio Ahumada2012-11-0748-144/+144
* Fix directshow plugin compiling error introduced by wmf plugin commitLing Hu2011-07-251-0/+1
* Add Windows Media Foundation backend for QMediaPlayerLing Hu2011-07-221-1/+2
* Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-multimedia int...Qt Continuous Integration System2011-07-191-3/+4
|\
| * Fix for QTMOBILITY-1772 VideoWidget example crash on windowsLing Hu2011-07-191-3/+4
* | Re-apply licenseheader text in source files for qtmobilityJyri Tahtela2011-06-3048-816/+816
|/
* Merge branch '1.1' of ../qtmobility into master-from-1.1Alex2011-05-161-0/+6
|\
| * Fix crash bug for mediaplayer directshow backend.Ling Hu2011-05-121-0/+6
* | Merge remote branch 'upstream/1.1' into master-from-1.1Toby Tomkins2011-05-091-0/+2
|\|
| * Fix missing break in the DirectShow backend.Alexis Menard2011-04-281-0/+2
* | Correct license.Michael Goddard2011-04-142-40/+28
* | Fix typo.Michael Goddard2011-04-131-1/+1
* | Initial creation of the Windows backend for cameraSteven Rawlings2011-04-082-30/+50
* | Initial creation of DirectInput backend for CameraSteven Rawlings2011-04-0816-0/+3013
* | Merge branch '1.1' of ../qtmobility into masterAlex2011-03-082-10/+10
|\|
| * Fix position report for DirectShow mediaplayer backendLing Hu2011-02-251-1/+1
| * Fix mediaStatus update for directshow mediaplayer backendLing Hu2011-02-241-0/+5
| * Fix mediaStatus update after positionChanged for Directshow mediaplayer backendLing Hu2011-02-241-0/+2
| * Fix mediaChanged signal in Directshow mediaplayer backendLing Hu2011-02-241-0/+1
| * Fix position report for DirectShow mediaplayer backendLing Hu2011-02-241-10/+2
* | Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/simulator-mobility...Qt Continuous Integration System2011-02-083-3/+29
|\ \
| * | Added multimediasupport for simulator on windowsOlli Werwolff2011-02-043-3/+29
* | | Fix potential race while a seek is pending.Andrew den Exter2011-02-071-2/+2
* | | Don't block the main thread when loading media from the network.Andrew den Exter2011-02-071-2/+3
|/ /
* / Identify which plug-ins support the VideoSurface output feature.Andrew den Exter2011-01-131-1/+1
|/
* Advertise if a media service supports stream playback.Andrew den Exter2011-01-042-1/+16
* Verify a proposed video surface format is supported.Chris Meyer2010-11-151-0/+3
* Correctly initialize m_byteSize member variable.Chris Meyer2010-11-151-1/+1
* Fix incorrect playing state update for mediaplayer(directshow backend)Ling Hu2010-11-081-1/+15
* Return position and duration in milliseconds from direct show backend.Andrew den Exter2010-11-021-12/+17
* Merge branch '1.0'Andrew den Exter2010-09-021-31/+31
|\
| * Use forward, not back slashes in file paths.Andrew den Exter2010-09-021-31/+31
* | Fix flicker in video widget on windows.Andrew den Exter2010-07-232-6/+33
|/
* Add config tests for the windows multimedia backends.Andrew den Exter2010-07-081-1/+1
* Rename merrry-go-round; QtMultimedia->QtMultimediaKit.Justin McPherson2010-06-032-59/+59
* Merge branch '1.0' of git@scm.dev.nokia.troll.no:qtmobility/qtmobility into 1.0Justin McPherson2010-05-2834-38/+34
|\
| * Bump copyright date from 2009 to 2010dac2010-05-0735-35/+35
| * simplify plugin project filesAlex2010-05-041-5/+0
| * Maemo6 plugins use a different target.pathLincoln Ramsay2010-04-291-0/+1
| * Unify plugin loading and push install prefix into mobility libraries.Wolfgang Beck2010-04-271-2/+2
| * Merge branch '1.0' of qtmobility/qtm-multimedia into 1.0Dmytro Poplavskiy2010-04-162-61/+61
| |\
| | * Renamed QtMultimedia namespace to QtMediaServicesDmytro Poplavskiy2010-04-162-61/+61
| * | Merge branch '1.0' of scm.dev.nokia.troll.no:qtmobility/qtmobility into 1.0Dmytro Poplavskiy2010-04-152-2/+2
| |\ \ | | |/ | |/|
| | * Renamed QtMedia pluginsStian Sandvik Thomassen2010-04-142-2/+2
| * | Renamed QtMedia namespace to QtMultimediaDmytro Poplavskiy2010-04-142-61/+61
| |/
| * Moved Multimedia out of QtMobility namespace.Dmytro Poplavskiy2010-04-078-11/+11
| * Merge branch '1.0' of ../../qtmobility into 1.0Justin McPherson2010-03-309-13/+13
| |\
| | * fix multimedia compiler errors using Qt in a namespace.Wolfgang Beck2010-03-259-13/+13
| * | Don't draw video widget borders or background by default.Andrew den Exter2010-03-301-0/+1
| |/