slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/5.3' into 5.4

Browse Source 
Conflicts:
	src/gsttools/qgstreamervideoinputdevicecontrol.cpp
	src/plugins/gstreamer/camerabin/camerabinserviceplugin.cpp
	src/plugins/gstreamer/mediacapture/qgstreamercaptureserviceplugin.cpp

Change-Id: Ic854589562d2deeaa0ebf75840cb8a2ee32e99de
This commit is contained in:
Frederik Gladhorn
2014-08-28 16:25:20 +02:00
parent 80ba1d635d 1dba07b602
commit 659f238bbb
38 changed files with 436 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/gstreamer/camerabin/camerabin.pro
View File

@@ -83,6 +83,8 @@ config_gstreamer_photography {
DEFINES += GST_USE_UNSTABLE_API #prevents warnings because of unstable photography API
}
config_linux_v4l: DEFINES += USE_V4L
OTHER_FILES += \
camerabin.json

3
src/plugins/gstreamer/camerabin/camerabinserviceplugin.cpp
View File

@@ -43,7 +43,10 @@
#include <private/qgstutils_p.h>
#include <private/qcore_unix_p.h>
#if defined(USE_V4L)
#include <linux/videodev2.h>
#endif
QT_BEGIN_NAMESPACE