summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-06-3042-617/+1705
|\
| * 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
| * Expand license scope from "Qt GUI Toolkit" to "Qt Toolkit"Sze Howe Koh2016-06-163-3/+3
| * 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-092-6/+73
| |\
| * | 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
| * | do not enable example installs explicitly any moreOswald Buddenhagen2016-05-241-1/+0
| * | DirectShow: fix playing resource files.Yoann Lopes2016-05-202-133/+41
| * | Bump versionOswald Buddenhagen2016-05-191-1/+1
* | | Merge remote-tracking branch 'origin/5.7.0' into 5.7Liang Qi2016-06-163-6/+140
|\ \ \
| * | | Mention license change in 5.7.0 changelog.v5.7.0Kai Koehne2016-06-081-2/+18
| * | | Add changelog for 5.7.0.Antti Kokko2016-06-071-0/+51
| * | | Merge remote-tracking branch 'origin/5.6.1' into 5.7.0Liang Qi2016-06-012-6/+73
| |\ \ \ | | | |/ | | |/|
| | * | winrt: Fix potential crash when querying for resolutionsv5.6.1-1v5.6.1Maurice Kalinowski2016-05-311-6/+9
| | * | Add changelog for 5.6.1.Yoann Lopes2016-05-231-0/+64
* | | | Implement QCameraViewfinderSettingsControl2 interface for AndroidRuslan Baratov2016-06-0210-45/+519
|/ / /
* | | Blacklist cases from qaudiodecoderbackend in Ubuntu 16.04v5.7.0-rc1Simo Fält2016-05-231-0/+1
* | | Merge 5.7 into 5.7.0Oswald Buddenhagen2016-05-203-14/+26
|\ \ \
| * \ \ 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-127-20/+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
* | | | Blacklisting pushSuspendResume for Ubuntu 16.04Milla Pohjanheimo2016-05-131-0/+1
|/ / /
* | | Stabilize tst_QAudioOutput::pull().Yoann Lopes2016-05-111-4/+2
* | | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-05-1046-719/+787
|\| |
| * | decruft project fileOswald Buddenhagen2016-05-101-6/+0
| * | 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
| |/
| * Polish the videowidget example.Friedemann Kleint2016-05-043-19/+62
| * DirectShow: Invoke IGraphBuilder::AddSourceFilter() with local file name.Friedemann Kleint2016-05-031-1/+4
| * fix example installsOswald Buddenhagen2016-04-286-0/+16
| * GStreamer camerabin: return the proper camera sourceZhang Xingtao2016-04-283-7/+19