summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.3' into devSergio Ahumada2014-06-14168-2724/+2755
|\
| * Merge remote-tracking branch 'origin/stable' into 5.3Sergio Ahumada2014-06-118-353/+353
| |\
| | * Make multimedia QML types available for the 5.3 import version.Yoann Lopes2014-06-101-0/+5
| | * Fix static initialization order fiasco in some plugins.Yoann Lopes2014-06-065-347/+337
| | * Android: Use a file descriptor for all local media files.Christian Strømme2014-06-052-6/+11
| |/
| * Improve default audio plugin selection.Yoann Lopes2014-06-051-6/+21
| * Android: don't start camera preview until the viewfinder is ready.Yoann Lopes2014-06-052-12/+26
| * Android: fix media player's volume.Yoann Lopes2014-06-051-11/+18
| * Doc: Remove comment about preliminary API for Qt 5.0Topi Reinio2014-06-051-7/+3
| * Android: Don't expose java calls in the control classes.Christian Strømme2014-06-0415-114/+238
| * Make it possible to build multimedia for embedded AndroidChristian Strømme2014-06-042-3/+3
| * Android: Rename the wrapper classesChristian Strømme2014-06-0434-533/+533
| * Use Q_CONSTRUCTOR_FUNCTION macro to register multimedia meta types.Yoann Lopes2014-05-3025-271/+150
| * OpenSL: don't try to enqueue new buffers when the buffer queue is full.Yoann Lopes2014-05-301-1/+1
| * Remove C++11 code in iMX6 video node plugin.Yoann Lopes2014-05-301-2/+2
| * Android: fix calling start() and stop() on the video surface.Yoann Lopes2014-05-301-1/+1
| * Android: Fix loading from qrcChristian Strømme2014-05-212-1/+6
| * DirectShow: remove debug output.Yoann Lopes2014-05-191-7/+0
| * WMF: fix video frames' viewport.Yoann Lopes2014-05-151-0/+12
| * Android: fix QMediaPlayer::bufferStatus value.Yoann Lopes2014-05-152-3/+17
| * Fix QSGVideoNode rendering of frames with stride != width.Andrew den Exter2014-05-152-18/+73
| * Improve documentation for the QMediaPlayer::bufferStatus property.Yoann Lopes2014-05-152-7/+21
| * Doc: Copy snippets from the Qt Multimedia moduleSze Howe Koh2014-05-142-0/+180
| * Android: Fix namespace usage.Christian Strømme2014-05-125-6/+12
| * Doc: Clean up references to Qt System InfoSze Howe Koh2014-05-124-0/+10
| * PLS parser: Don't translate entries.Yoann Lopes2014-05-091-3/+3
| * GStreamer: disable clock syncing in video sink for live sources.Yoann Lopes2014-05-091-0/+1
| * Moved QMediaStorageLocation out of the Android plugin.Yoann Lopes2014-05-098-49/+82
| * Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2014-05-0116-64/+81
| |\
| | * Fix documentation of qmlvideofx examplev5.3.0-rc1v5.3.0Niels Weber2014-04-3012-18/+9
| | * Handle resizing of mainwindow betterNiels Weber2014-04-301-1/+2
| | * Selecting something now closes menuNiels Weber2014-04-301-28/+48
| | * Add missing background for effect selection list.Niels Weber2014-04-302-17/+22
| * | [QNX] Introduce env variable for default audio sinkAndreas Holzammer2014-04-251-1/+2
| * | Fix documentation errorFabian Bumberger2014-04-240-0/+0
| * | Merge remote-tracking branch 'origin/release' into stableJani Heikkinen2014-04-2362-1115/+804
| |\|
| | * Rework qmlvideofx exampleNiels Weber2014-04-1847-1037/+723
| | * Doc: Improved example documentationJerome Pasion2014-04-1414-76/+73
| | * Android: Release the surface texture when not in useChristian Strømme2014-04-121-2/+8
| * | Bump MODULE_VERSION to 5.3.1Sergio Ahumada2014-04-221-1/+1
| * | Android: Camera code clean-upChristian Strømme2014-04-154-334/+304
| * | Android: Use QMutexLock in camera callbacks.Christian Strømme2014-04-151-8/+4
| |/
* | Doc: Fix qmlclass selector used in documentation configTopi Reinio2014-06-111-1/+1
* | Handle resource requests through singleton.Robin Burchell2014-06-045-79/+440
* | Remove some Q_WS_MAEMO_6 instances from examples.Robin Burchell2014-05-125-307/+1
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-04-1148-404/+689
|\|
| * Android: Use Q_GLOBAL_STATIC instead of a static QMapChristian Strømme2014-04-091-5/+6
| * Android: Fix the signature for setOnInfoListener.Christian Strømme2014-04-091-1/+1
| * Fix some MediaPlayer properties returning wrong values.Yoann Lopes2014-04-092-23/+23
| * WMF: improve changing playback rate on a media player.Yoann Lopes2014-04-092-6/+48