summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-06-3037-607/+1695
|\
| * Fix use of -ESTRPIPE where it's not available in errnoRalf Nolden2016-06-292-3/+16
| * PulseAudio: keep device list up to date.Yoann Lopes2016-06-202-24/+103
| * AVFoundation: improve changing the capture device format.Yoann Lopes2016-06-145-43/+74
| * AVFoundation: re-apply viewfinder settings on mode changes.Yoann Lopes2016-06-135-10/+28
| * AVFoundation: fix orientation of recorded videos.Yoann Lopes2016-06-134-4/+28
| * AVFoundation: implement QAudioEncoderSettings.Yoann Lopes2016-06-0910-23/+346
| * AVFoundation: implement QMediaContainerControl.Yoann Lopes2016-06-098-5/+193
| * Merge remote-tracking branch 'origin/5.6.1' into 5.6Liang Qi2016-06-091-6/+9
| |\
| * | winrt: Fix synchronization problems to render threadMaurice Kalinowski2016-06-081-1/+1
| * | winrt: Add logging to QWinRTAbstractVideoRendererControlMaurice Kalinowski2016-06-081-0/+9
| * | Android: Fix crash in AndroidCamere::open()Christian Strømme2016-06-031-1/+0
| * | QCameraPrivate: NULL-fill fields to be set up by init().Edward Welbourne2016-06-031-0/+3
| * | ALSA: improve handling of default device.Yoann Lopes2016-06-034-109/+56
| * | Android: flush the current video frame when the video output is reset.Yoann Lopes2016-06-031-0/+4
| * | AVFoundation: correctly set default frame rate on OSX.Yoann Lopes2016-06-031-0/+7
| * | AVFoundation: implement QVideoEncoderSettingsControl.Yoann Lopes2016-06-0316-258/+781
| * | winrt: focus action has to happen in the xaml threadMaurice Kalinowski2016-05-311-39/+51
| * | DirectShow: fix playing resource files.Yoann Lopes2016-05-202-133/+41
* | | Merge remote-tracking branch 'origin/5.7.0' into 5.7Liang Qi2016-06-161-6/+9
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/5.6.1' into 5.7.0Liang Qi2016-06-011-6/+9
| |\ \ \ | | | |/ | | |/|
| | * | winrt: Fix potential crash when querying for resolutionsv5.6.1-1v5.6.1Maurice Kalinowski2016-05-311-6/+9
* | | | Implement QCameraViewfinderSettingsControl2 interface for AndroidRuslan Baratov2016-06-0210-45/+519
|/ / /
* | | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-05-193-14/+26
|\ \ \ | | |/ | |/|
| * | Merge remote-tracking branch 'origin/5.6.1' into 5.6Liang Qi2016-05-192-12/+24
| |\|
| | * Doc: Remove repository name from examplesinstallpathTopi Reinio2016-05-121-3/+0
| | * Merge 5.6 into 5.6.1Oswald Buddenhagen2016-05-126-14/+68
| | |\
| | * | winrt: Fix crash when initializing certain camerasMaurice Kalinowski2016-05-111-9/+24
| * | | Make qtmultimedia 5.6 branch compile without c++11:nullptr usageRalf Nolden2016-05-171-1/+1
| | |/ | |/|
| * | winrt: Only set focus if supportedMaurice Kalinowski2016-05-101-1/+1
* | | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-05-1033-650/+701
|\| |
| * | Android: improve texture rendering on API level >= 16.Yoann Lopes2016-05-104-13/+57
| * | Add FreeBSD define and include for <sys/types.h> where <linux/types.h> is usedRalf Nolden2016-05-091-0/+4
| * | Android: detect more error cases when rendering frames to textures.Yoann Lopes2016-05-091-0/+3
| * | Android: correctly use mutex for texture rendering.Yoann Lopes2016-05-091-0/+3
| |/
| * DirectShow: Invoke IGraphBuilder::AddSourceFilter() with local file name.Friedemann Kleint2016-05-031-1/+4
| * GStreamer camerabin: return the proper camera sourceZhang Xingtao2016-04-283-7/+19
| * CoreAudio: use AudioComponent instead of deprecated Carbon ComponentDyami Caliri2016-04-272-54/+11
| * QNX: Avoid reading frames faster than they're renderedDan Cape2016-04-275-247/+241
| * Fix macro redefinition warningChristian Stromme2016-04-271-12/+7
| * Fix unused variable warningChristian Stromme2016-04-261-2/+5
| * Fix property attributes.Christian Stromme2016-04-261-5/+5
| * winrt: Disable camera deactivation automation in debug modeMaurice Kalinowski2016-04-221-0/+4
| * winrt: Fix device watcher handlingMaurice Kalinowski2016-04-221-1/+2
| * winrt: fix camera control after move to xaml threadMaurice Kalinowski2016-04-225-193/+230
| * winrt: Add categorized logging to camera controlMaurice Kalinowski2016-04-223-0/+17
| * winrt: Use ComPtr for better ref count trackingMaurice Kalinowski2016-04-223-4/+6
| * AVFMediaAssetWriter - fix potential race condition(s)Timur Pocheptsov2016-04-214-109/+71
| * AVFFoundation - fix a compilation error (iOS, XCode 7.3)Timur Pocheptsov2016-04-191-3/+3
| * ALSA: Call snd_pcm_drain() on suspendStephen Hurd2016-04-152-0/+2
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-24 02:04:54 +0000