Merge remote-tracking branch 'origin/5.5' into 5.6

Change-Id: I6d88b17f44479a522d181374023648dd007112bd
2016-01-21 08:00:31 +01:00
parent 02b8c7527a 42dc973881
commit 365e05bad8
11 changed files with 51 additions and 36 deletions
--- a/src/multimedia/gsttools_headers/qgstappsrc_p.h
+++ b/src/multimedia/gsttools_headers/qgstappsrc_p.h
@@ -65,7 +65,6 @@ public:
    ~QGstAppSrc();

    bool setup(GstElement *);
-    bool isReady() const { return m_setup; }

    void setStream(QIODevice *);
    QIODevice *stream() const;
@@ -104,7 +103,6 @@ private:
    GstAppStreamType m_streamType;
    GstAppSrcCallbacks m_callbacks;
    qint64 m_maxBytes;
-    bool m_setup;
    unsigned int m_dataRequestSize;
    bool m_dataRequested;
    bool m_enoughData;