summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Android: use QGuiApplication::applicationState() for releasing camera.wip/androidYoann Lopes2013-09-0310-304/+34
* Merge branch 'dev' into wip/androidYoann Lopes2013-09-0333-747/+283
|\
| * PulseaudioInput: Remove unused membersTobias Hunger2013-09-021-2/+0
| * QGstXvImageBuffer: fix warning about class/struct mismatchTobias Hunger2013-09-021-1/+2
| * QGstTools: Fix warning about unused m_intervalTimerTobias Hunger2013-09-021-0/+2
| * Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-08-2713-45/+115
| |\
| | * WMF and GStreamer: fixed incorrect frame startTime and endTime.Yoann Lopes2013-08-224-12/+40
| | * Android: Use isValid() to check if the jobject is valid.Christian Strømme2013-08-211-2/+2
| | * Android: fixed media player buffering logic.Yoann Lopes2013-08-192-8/+7
| | * Fix file browser in qmlvideofx example.Friedemann Kleint2013-08-192-13/+10
| | * Merge remote-tracking branch 'origin/release' into stableSergio Ahumada2013-08-161-0/+45
| | |\
| | | * Add changes-5.1.1 file.v5.1.1Yoann Lopes2013-08-161-0/+45
| | * | WMF: fixed QMediaPlayer changing to EndOfMedia status too early.Yoann Lopes2013-08-161-7/+7
| | * | WMF: use qFabs instead of fabsf.Yoann Lopes2013-08-161-2/+3
| | * | Enable QSoundEffect with loopCount of Infinite to playAndy Nichols2013-08-131-1/+1
| * | | AVFoundation: Basic camera support for iOSAndy Nichols2013-08-272-6/+9
| * | | AVFoundation: Enable QVideoWidget on iOSAndy Nichols2013-08-272-22/+21
| * | | AVFoundation: Use CoreAnimation to render video to QVideoWidgetAndy Nichols2013-08-277-262/+115
| * | | AVFoundation: Enable use of QMediaPlayer for audio on iOSAndy Nichols2013-08-276-37/+48
| * | | AVFoundation: Remove QVideoSurfaceCoreGraphicsPainterAndy Nichols2013-08-264-404/+3
* | | | Merge branch 'dev' into wip/androidYoann Lopes2013-08-23111-347/+922
|\ \ \ \ | |/ / /
| * | | Remove unnecessary dependency to qtjsbackend from sync.profileSimon Hausmann2013-08-161-1/+0
| * | | Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/stagi...Frederik Gladhorn2013-08-1311-17/+390
| |\ \ \
| | * \ \ Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-08-1211-17/+390
| | |\ \ \ | | | |/ /
| | | * | Implement resource policy plugin using libresourceqt.Robin Burchell2013-08-057-0/+375
| | | * | Fixed bug in QWaveDecoder.Yoann Lopes2013-08-051-14/+11
| | | * | Change libresourceqt's .pc file.Robin Burchell2013-08-053-3/+3
| * | | | Doc: Renamed HTML file for "Qt Multimedia on Windows" page.Jerome Pasion2013-08-121-1/+1
| |/ / /
| * | | Merge branch 'stable' into devSergio Ahumada2013-08-0536-25/+62
| |\ \ \ | | |/ /
| | * | Remove left-over debug output.Friedemann Kleint2013-07-311-1/+0
| | * | Fix file browser in qmlvideo example.Friedemann Kleint2013-07-302-8/+12
| | * | fix build without quickOswald Buddenhagen2013-07-301-1/+1
| | * | Make PulseAudio implementation of QSoundEffect more robust.Yoann Lopes2013-07-252-8/+47
| | * | Use the new (-no)-wmf-backend configuration optionWouter Huysentruit2013-07-251-1/+1
| | * | Moved declarative-camera example in the right directory.Yoann Lopes2013-07-2431-7/+2
| | * | Bump MODULE_VERSION to 5.1.2Sergio Ahumada2013-07-241-1/+1
| | |/
| * | Doc: Setting \qtvariable values in module pages.Jerome Pasion2013-08-022-0/+2
| * | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-07-234-19/+45
| |\ \ | | |/
| | * DirectShow: avoid unnecessary RGB32 -> BGR32 conversion.Yoann Lopes2013-07-191-1/+1
| | * DirectShow: Don't create the widget and renderer controls until requested.Yoann Lopes2013-07-192-15/+31
| | * WMF: fixed MediaPlayer buffering logic.Yoann Lopes2013-07-191-3/+13
| * | OpenSL ES audio plugin.Yoann Lopes2013-07-1916-0/+2134
| * | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-07-1110-30/+158
| |\ \ | | |/
| | * Android: removed unnecessary init class for QtMultimedia.jarYoann Lopes2013-07-091-2/+2
| | * Android: Make it possible for MediaPlayer to read from assets.Christian Strømme2013-07-091-1/+14
| | * Android: wait to have a valid video surface before loading a media.Yoann Lopes2013-07-095-27/+130
| | * Android: release the Android media player before destroying it.Yoann Lopes2013-07-093-0/+8
| | * Fix resource leak in directshow plugin.tommyadam2013-07-041-0/+4
| * | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-2730-54/+119
| |\ \ | | |/
| | * Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-06-2522-21/+84
| | |\