diff options
author | Liang Qi <liang.qi@qt.io> | 2019-06-03 11:18:47 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2019-06-03 11:18:47 +0200 |
commit | dfc0ee4975958f7144f04957b6d5856a28e99361 (patch) | |
tree | 249cc992e09e208c29369830af8cce6b0456a9bf /src/gsttools/qgstreamerplayersession_p.h | |
parent | 7ef21f7ed206749252fbd03f673a8588890828b1 (diff) | |
parent | 3bbeae539854c1474844c65025d40b813cec286c (diff) |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
src/plugins/directshow/player/directshowplayerservice.cpp
Change-Id: I6b7edc312ecfadf84653ce24321ec55da41e131a
Diffstat (limited to 'src/gsttools/qgstreamerplayersession_p.h')
-rw-r--r-- | src/gsttools/qgstreamerplayersession_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gsttools/qgstreamerplayersession_p.h b/src/gsttools/qgstreamerplayersession_p.h index b613793c4..d4b050272 100644 --- a/src/gsttools/qgstreamerplayersession_p.h +++ b/src/gsttools/qgstreamerplayersession_p.h @@ -208,7 +208,8 @@ private: void addAudioBufferProbe(); void flushVideoProbes(); void resumeVideoProbes(); - void setPipeline(GstElement *pipeline); + bool parsePipeline(); + bool setPipeline(GstElement *pipeline); QNetworkRequest m_request; QMediaPlayer::State m_state; |