summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge dev into 5.5Oswald Buddenhagen2015-02-2443-633/+916
|\
| * Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/devSergio Ahumada2015-02-2216-42/+49
| |\
| | * Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2015-02-1316-42/+49
| | |\
| | | * Android: fix adjusting camera viewfinder resolution.Yoann Lopes2015-02-111-9/+14
| | | * Fix some typosSergio Ahumada2015-02-1111-17/+17
| | | * Merge "Merge remote-tracking branch 'origin/5.4.1' into 5.4" into refs/stagin...Frederik Gladhorn2015-02-101-1/+1
| | | |\
| | | | * Merge remote-tracking branch 'origin/5.4.1' into 5.4Frederik Gladhorn2015-02-101-1/+1
| | | | |\
| | | | | * Ensure the system libraries are linked when -opengl dynamic is usedv5.4.1Andy Shaw2015-02-031-1/+1
| | | * | | Clarify documentation for QImageCapture's 'ready' property.Yoann Lopes2015-02-102-14/+11
| | | * | | Encode urls passed to media player properlyJoni Poikelin2015-02-101-1/+1
| | | |/ /
| | | * | directshow: Fix plugging/unplugging a second cameraSergio Martins2015-02-051-6/+9
| | | * | Fix memory leak in QWindowsAudioDeviceInfo::availableDevices().Friedemann Kleint2015-02-051-0/+2
| | | * | Add the library prefix to QObject in public headerSergio Ahumada2015-02-041-1/+1
| | | * | Fix no-opengl pixel format check (reenables Format_RGB24)Peter Seiderer2015-02-021-1/+1
| | | |/
| * | | Remove BlackBerry PlayBook support.Rafael Roquetto2015-02-187-64/+6
| * | | GStreamer: some improvements with the camerabin's capture settings.Yoann Lopes2015-02-183-30/+44
| * | | GStreamer: improve camerabin audio settings checking.Yoann Lopes2015-02-181-3/+3
| * | | GStreamer camerabin: don't recreate camera source on device change.Yoann Lopes2015-02-181-33/+34
| * | | GStreamer: remove unused function and enum.Yoann Lopes2015-02-182-12/+0
| * | | GStreamer: runtime check for controls that require GstPhotography.Yoann Lopes2015-02-184-21/+45
| * | | GStreamer 1.0: fix some problems with QGstVideoRendererSink.Yoann Lopes2015-02-182-97/+22
| * | | GStreamer: implemented QCameraViewfinderSettingsControl2.Yoann Lopes2015-02-1812-204/+572
| * | | GStreamer 1.0: fix frame rate retrieved with QGstUtils::formatFromCaps.Yoann Lopes2015-02-181-1/+1
| * | | GStreamer: fix camerabin state and status changes.Yoann Lopes2015-02-188-138/+152
* | | | Fix some qdoc-warnings.Friedemann Kleint2015-02-232-4/+4
|/ / /
* / / Fix BSD license headersSergio Ahumada2015-02-171-3/+3
|/ /
* | Update copyright headersAntti Kokko2015-02-12877-6921/+6441
* | Camera zoom control - version for the AVFoundation pluginTimur Pocheptsov2015-02-055-1/+294
* | AVFCameraExposureControl - exposure control for iOSTimur Pocheptsov2015-02-055-2/+756
* | AVFCameraFocusControl - focus control for iOS / OS XTimur Pocheptsov2015-02-056-3/+474
* | Camera: update viewfinder settings on Loaded status.Yoann Lopes2015-02-041-1/+3
* | iOS video frame render implementation.James Turner2015-02-048-61/+575
* | Add video filtering support to VideoOutputLaszlo Agocs2015-02-0327-70/+777
* | Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/devYoann Lopes2015-01-2315-66/+119
|\ \
| * | Merge remote-tracking branch 'origin/5.4' into devYoann Lopes2015-01-1915-66/+119
| |\|
| | * Add resolution and fps on mfw_v4lsrcLaszlo Agocs2015-01-123-5/+63
| | * Migrate to categorized logging in Quick 2 video outputLaszlo Agocs2015-01-092-23/+15
| | * Support byte ordered QImage formats in pixelFormatFromImageFormatLaszlo Agocs2015-01-091-0/+3
| | * Support YUV420P in the i.MX6 video nodeLaszlo Agocs2015-01-061-0/+1
| | * Fix: static linking on Linux with both PulseAudio and Alsa pluginsGabriel Hege2014-12-228-38/+38
* | | Fix initialization orderLaszlo Agocs2015-01-191-1/+1
|/ /
* | Rename camera classes to avoid name clash.James Turner2015-01-159-56/+59
* | New camera viewfinder settings API.Yoann Lopes2015-01-1316-42/+923
* | AVFImageCaptureControl - invalid connectionTimur Pocheptsov2015-01-081-17/+8
* | Add missing includes for QDataStream/QIODevice.Friedemann Kleint2015-01-0710-0/+11
* | Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/devFrederik Gladhorn2014-12-2911-25/+112
|\ \
| * | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-12-1711-25/+112
| |\|
| | * winrt: Add missing QAbstractVideoSurface::stop() call.Andrew Knight2014-12-111-2/+4
| | * winrt: Fix encoding propertiesAndrew Knight2014-12-111-4/+17
| | * winrt: Fix camera auto rotationAndrew Knight2014-12-114-0/+26