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

Conflicts: src/gsttools/qgstreamervideoinputdevicecontrol.cpp src/plugins/gstreamer/camerabin/camerabinserviceplugin.cpp src/plugins/gstreamer/mediacapture/qgstreamercaptureserviceplugin.cpp Change-Id: Ic854589562d2deeaa0ebf75840cb8a2ee32e99de
2014-08-28 16:25:20 +02:00
parent 80ba1d635d 1dba07b602
commit 659f238bbb
38 changed files with 436 additions and 149 deletions
--- a/src/plugins/avfoundation/mediaplayer/avfmediaplayersession.h
+++ b/src/plugins/avfoundation/mediaplayer/avfmediaplayersession.h
@@ -148,6 +148,9 @@ private:
        QByteArray rawData;
    };

+    void setAudioAvailable(bool available);
+    void setVideoAvailable(bool available);
+
    AVFMediaPlayerService *m_service;
    AVFVideoOutput *m_videoOutput;