diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-09 03:08:11 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-07-11 11:45:13 +0200 |
| commit | 27497df23e68488472f922ead948b034225f9f3b (patch) | |
| tree | 1d47484f345a0cc0a6147506459c55023eacf504 /src/gsttools | |
| parent | be84c8103b830c4c4bbda7ccfc72aea5b10e779b (diff) | |
| parent | 1b70bbed49d12af86851a505a5aa5428b9e0c567 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
.qmake.conf
Change-Id: Ic700bdddc5b4ae663af0daae54feb2420c8a1730
Diffstat (limited to 'src/gsttools')
| -rw-r--r-- | src/gsttools/qgstreamerplayersession.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gsttools/qgstreamerplayersession.cpp b/src/gsttools/qgstreamerplayersession.cpp index 5ede8a1c9..15587f0ce 100644 --- a/src/gsttools/qgstreamerplayersession.cpp +++ b/src/gsttools/qgstreamerplayersession.cpp @@ -981,9 +981,11 @@ bool QGstreamerPlayerSession::isSeekable() const bool QGstreamerPlayerSession::play() { +#if GST_CHECK_VERSION(1,0,0) static bool dumpDot = qEnvironmentVariableIsSet("GST_DEBUG_DUMP_DOT_DIR"); if (dumpDot) - gst_debug_bin_to_dot_file_with_ts(GST_BIN(m_pipeline), GstDebugGraphDetails(GST_DEBUG_GRAPH_SHOW_ALL), "session.play"); + gst_debug_bin_to_dot_file_with_ts(GST_BIN(m_pipeline), GstDebugGraphDetails(GST_DEBUG_GRAPH_SHOW_ALL), "gst.play"); +#endif #ifdef DEBUG_PLAYBIN qDebug() << Q_FUNC_INFO; #endif |