summaryrefslogtreecommitdiffstats
path: root/src/multimedia
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-101-1/+1
|\
| * Doc: Fixing typoSergio Ahumada2010-11-091-1/+1
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-11-102-13/+19
|\ \
| * | Fix potential buffer overrun in ALSA QAudioInput implementation.Andrew den Exter2010-11-101-9/+12
| * | Fix potential buffer overrun in QAudioInput windows implementation.Andrew den Exter2010-11-101-4/+7
| |/
* | Fixed wrong include path in multimedia.axis2010-11-091-2/+2
|/
* Fixed many spelling errors.Rohan McGovern2010-10-253-4/+4
* Merge remote branch 'origin/4.6' into 4.7-from-4.6Rohan McGovern2010-10-0410-40/+141
|\
| * Fix compile failure in QtMultimedia.Andrew den Exter2010-09-231-3/+3
| * Verify the audio format before trying to open an audio device.Andrew den Exter2010-09-2210-35/+141
| * Implement QAudioInput::suspend() using CMMFDevSound::Stop()Gareth Stockwell2010-09-174-42/+73
| * Discard buffer pointer when DevSound is stoppedGareth Stockwell2010-09-171-0/+1
| * Suppress overflow errors raised by Symbian DevSound during playbackGareth Stockwell2010-09-171-0/+3
| * Discard empty buffer on call to QAudioOutput::resume()Gareth Stockwell2010-09-171-1/+1
| * Permit QAudioOutput::processedUSecs() to be called immediately after start()Gareth Stockwell2010-09-171-8/+9
| * Discard all DevSound buffers held when QAudioInput::suspend() calledGareth Stockwell2010-09-171-4/+3
| * Fixed buffer overrun in Symbian QAudioInput backendGareth Stockwell2010-09-171-4/+6
| * QAudioOutput(ALSA); Fix check for available devices.Justin McPherson2010-08-121-14/+17
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-09-174-52/+89
|\ \
| * | Implement QAudioInput::suspend() using CMMFDevSound::Stop()Gareth Stockwell2010-09-174-42/+73
| * | Discard buffer pointer when DevSound is stoppedGareth Stockwell2010-09-171-0/+1
| * | Suppress overflow errors raised by Symbian DevSound during playbackGareth Stockwell2010-09-171-0/+3
| * | Discard empty buffer on call to QAudioOutput::resume()Gareth Stockwell2010-09-171-1/+1
| * | Permit QAudioOutput::processedUSecs() to be called immediately after start()Gareth Stockwell2010-09-171-8/+9
| * | Discard all DevSound buffers held when QAudioInput::suspend() calledGareth Stockwell2010-09-171-4/+3
| * | Fixed buffer overrun in Symbian QAudioInput backendGareth Stockwell2010-09-171-4/+6
* | | Fixed spelling, broken links, and missing default values.Jerome Pasion2010-08-301-1/+1
|/ /
* | QAudioOutput(ALSA); Fix check for available devices.Justin McPherson2010-08-121-14/+17
* | 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
|\ \ \ \ | | |/ / | |/| |