summaryrefslogtreecommitdiffstats
path: root/src/multimedia
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-011-9/+16
|\
| * Add media elements to the QML Elements docs.Martin Jones2010-04-011-9/+16
* | Merge remote branch 'integration/qt-4.7-from-4.6' into 4.7Olivier Goffart2010-03-311-10/+14
|\ \ | |/
| * Fixed incorrectly clipped video when rendered on QGLWidgetDmytro Poplavskiy2010-03-311-10/+14
* | Merge remote branch 'origin/4.7' into 4.7Olivier Goffart2010-03-307-32/+440
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-03-307-32/+440
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7Dmytro Poplavskiy2010-03-301-7/+27
| | |\
| | | * Remove debug code disabling the video widget output control.Andrew den Exter2010-03-301-1/+0
| | | * Force a repaint on changes in the native size of video frames.Andrew den Exter2010-03-301-0/+2
| | | * Don't fill the video widget borders or background by default.Andrew den Exter2010-03-301-7/+26
| | * | Fixed compilation on 64 bits Mac OS 10.5Dmytro Poplavskiy2010-03-301-1/+1
| | |/
| | * Update PulseAudio config.test.Justin McPherson2010-03-291-1/+2
| | * QuickTime media backend: Render CIImage based video frames directly withDmytro Poplavskiy2010-03-295-24/+411
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-301-1/+1
|\ \ \ | |/ / |/| |
| * | Merge remote branch 'origin/4.7' into 4.7Olivier Goffart2010-03-253-21/+23
| |\ \ | | |/
| * | Fix warnings and build on mingwThierry Bastian2010-03-251-1/+1
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Martin Jones2010-03-253-21/+23
|\ \ \ | | |/ | |/|
| * | Merge remote branch 'main/4.7' into 4.7Morten Johan Sørvig2010-03-252-9/+9
| |\ \ | | |/
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-243-21/+23
| |\ \
| | * | Compile Qt in C++0x mode.Thiago Macieira2010-03-201-17/+17
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-182-4/+6
| | |\ \
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-182-4/+6
| | | |\ \
| | | | * | Rename QTimestamp to QElapsedTimerThiago Macieira2010-03-172-6/+6
| | | | * | Port QtMultimedia uses of QTime as a stopwatch to QTimestamp (unix code only)Thiago Macieira2010-03-172-4/+6
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-252-3/+4
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.7Alexis Menard2010-03-252-3/+4
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-03-241-2/+2
| | |\ \ \ \
| | | * | | | Calculate period size correctly.Justin McPherson2010-03-241-2/+2
| | * | | | | Symbian QAudioOutput::suspend() was resetting processedUSecs() to zeroGareth Stockwell2010-03-241-1/+2
| | |/ / / /
* | | | | | Rename loopCount to loops, in line with other declarative elements.Justin McPherson2010-03-252-9/+9
|/ / / / /
* | | | | Added extra video buffer handle types.Dmytro Poplavskiy2010-03-242-0/+4
| |/ / / |/| | |
* | | | Replace AspectRatioMode enum from QVideoWidget with Qt::AspectRatioMode.Andrew den Exter2010-03-187-65/+79
| |/ / |/| |
* | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-173-30/+52
|\ \ \ | |/ / | | / | |/ |/|
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-03-163-30/+52
| |\
| | * Use AudioConverter when not preferred format.Justin McPherson2010-03-162-26/+34
| | * Handle values passed to setNotifyInterval more robustly.Justin McPherson2010-03-162-2/+16
| | * Make sure to check for a valid audioformat before open.Justin McPherson2010-03-162-2/+2
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-151-1/+1
|\ \ \
| * | | That file was forgotten when adding SSE support under mingwThierry Bastian2010-03-151-1/+1
* | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-1515-9/+2603
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Moved Symbian audio backend into QtMultimedia.dllGareth Stockwell2010-03-1210-6/+2571
| |/
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6Kurt Korbatits2010-03-112-1/+2
| |\
| | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging int...Justin McPherson2010-03-111-1/+5
| | |\
| | * | Ensure audio converter member is initialized.Justin McPherson2010-03-111-0/+1
| | * | Documentation fix.Justin McPherson2010-03-111-1/+1
| * | | QAudioInput sometimes not writing to QIODeviceKurt Korbatits2010-03-111-0/+20
| | |/ | |/|
| * | QAudioInput::processedUSecs() incorrectKurt Korbatits2010-03-111-1/+5
| |/
| * SIGSEGV after QAudioOutput closed.Kurt Korbatits2010-03-101-0/+3
| * Fixed deadlock introduced by changeKurt Korbatits2010-03-101-1/+2
| * Fixed invokeMethod in alsa implementation.Kurt Korbatits2010-03-101-1/+1