summaryrefslogtreecommitdiffstats
path: root/src/multimedia
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/4.6' into 4.7-from-4.6Rohan McGovern2010-07-291-1/+1
|\
| * Fixed QVideoSurfaceFormat::isValid()Dmytro Poplavskiy2010-07-221-1/+1
* | Merge remote branch 'origin/4.7' into 4.7-from-4.6Rohan McGovern2010-07-172-0/+2
|\ \
| * | Added a QPixmap based QAbstractVideoBuffer HandleType.Dmytro Poplavskiy2010-07-162-0/+2
* | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-07-158-40/+196
|\ \ \ | |/ / |/| / | |/
| * Don't try and use QFactoryLoader when relevant features are turned off.Justin McPherson2010-07-071-4/+15
| * Segmentation Fault in QAudioOutputPrivate::freeBlocks() caused by wrongKurt Korbatits2010-07-022-2/+2
| * QAudioInput push mode does not workKurt Korbatits2010-06-292-15/+40
| * Fix compile error on win32 with multimedia lib.Kurt Korbatits2010-06-251-3/+2
| * Fix compile err with win2005 compiler for multimedia lib.Kurt Korbatits2010-06-251-1/+2
| * Fixed compile error in multimedia moduleKurt Korbatits2010-06-241-0/+4
| * Fixed compile error introduced by win32 surround sound support change.Kurt Korbatits2010-06-241-1/+42
| * Added surround sound support to alsa low-level audio backend.Kurt Korbatits2010-06-242-0/+51
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6Kurt Korbatits2010-06-244-40/+36
| |\
| * | Added surround sound support to win32 low-level audio backend.Kurt Korbatits2010-06-242-9/+50
* | | Merge branch '4.6-s60' into 4.7-s60axis2010-06-243-40/+33
|\ \ \ | | |/ | |/|
| * | Audio(osx); Fix period size calculation.Justin McPherson2010-06-221-13/+2
| * | Audio(osx); refactor input period conversionJustin McPherson2010-06-221-24/+25
| * | Audio(osx); Fix audio format converters.Justin McPherson2010-06-221-3/+6
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-231-0/+1
|\ \ \
| * | | Fix missing QImage::Format to QVideoFrame::PixelFormat conversion.Andrew den Exter2010-06-231-0/+1
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6Simon Hausmann2010-06-201-0/+3
|\ \ \ \ | | |/ / | |/| |
| * | | Fixed memory lean in QImageVideoBuffer and QMemoryVideoBuffer.Dmytro Poplavskiy2010-06-181-0/+3
| | |/ | |/|
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6Simon Hausmann2010-06-161-2/+2
|\ \ \ | |/ / | | / | |/ |/|
| * Audio (osx); In pull mode emit readyRead() for each period received.Justin McPherson2010-06-161-2/+2
* | Fix location of QtMultimedia def filesShane Kearns2010-05-281-3/+0
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-05-252-2/+71
|\ \ | |/
| * QAudioDeviceInfo::nearestFormat() consistent across all platformsKurt Korbatits2010-05-191-1/+61
| * The documentation for processedUSecs() is ambiguousKurt Korbatits2010-05-191-1/+10
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-05-19137-16997/+16
|\ \
| * | Removed mediaservices.Kurt Korbatits2010-05-18137-16995/+16
* | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-05-179-453/+659
|\ \ \ | | |/ | |/|
| * | Merge branch '4.6' of S:\sync\git\trolltech\qt-s60-public.git\ into 4.6Gareth Stockwell2010-05-112-0/+20
| |\ \
| | * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-05-108-453/+649
| | |\ \
| | * | | Update to low-level audio documentation.Kurt Korbatits2010-05-092-0/+20
| * | | | Fixed typo in QAudioInput bufferSize documentationGareth Stockwell2010-05-111-2/+2
| | |/ / | |/| |
| * | | Return correct formats supported lists from Symbian audio backendGareth Stockwell2010-05-108-453/+649
| |/ /
* | | Compile with opengl enabled.Warwick Allison2010-05-071-0/+2
| |/ |/|
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-05-021-7/+7
|\ \
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-05-011-7/+7
| |\ \
| | * | Fix QT_NO_LIBRARYTasuku Suzuki2010-04-291-7/+7
* | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-04-306-94/+74
|\ \ \ \ | |/ / / |/| | |
| * | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-04-296-92/+71
| |\ \ \ | | | |/ | | |/|
| | * | win32 backend for low-level audio fixesKurt Korbatits2010-04-264-78/+67
| | * | Disable notify() signal when setNotifyInterval is zero in alsa backend.Kurt Korbatits2010-04-232-14/+4
| * | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-04-273-6/+7
| |\ \ \ | | |_|/ | |/| |
| | * | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-04-253-6/+7
| | |\ \
| | | * \ Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-04-233-6/+7
| | | |\ \
| | | | * \ Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-04-213-6/+7
| | | | |\ \ | | | | | |/
| | | | | * QAudioOutput always uses default output deviceKurt Korbatits2010-04-211-4/+3