diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-11 18:48:35 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2019-09-12 08:50:11 +0000 |
commit | 324471ef9054911422f8f2d40a243c67b501c8f0 (patch) | |
tree | b6fccceb55f338a8c53e31afb88a4fce965d305b /src/gsttools/qgstvideorenderersink.cpp | |
parent | c9058d90d0b08781f14a494780c3094594c81f22 (diff) | |
parent | a1bf811b1dd287fbb75b6d27dbc163f15001e28f (diff) |
Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
src/gsttools/qgstvideorenderersink.cpp
src/gsttools/qgstvideorenderersink_p.h
Change-Id: I7fe29161d568fa3f7688abfd2f993d1b16ac3fb9
Diffstat (limited to 'src/gsttools/qgstvideorenderersink.cpp')
-rw-r--r-- | src/gsttools/qgstvideorenderersink.cpp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/gsttools/qgstvideorenderersink.cpp b/src/gsttools/qgstvideorenderersink.cpp index adcc9a6ce..3b458a978 100644 --- a/src/gsttools/qgstvideorenderersink.cpp +++ b/src/gsttools/qgstvideorenderersink.cpp @@ -78,8 +78,6 @@ QT_BEGIN_NAMESPACE QGstDefaultVideoRenderer::QGstDefaultVideoRenderer() - : m_flushed(true) - , m_handleType(QAbstractVideoBuffer::NoHandle) { } @@ -169,14 +167,6 @@ Q_GLOBAL_STATIC_WITH_ARGS(QMediaPluginLoader, rendererLoader, QVideoSurfaceGstDelegate::QVideoSurfaceGstDelegate(QAbstractVideoSurface *surface) : m_surface(surface) - , m_renderer(0) - , m_activeRenderer(0) - , m_surfaceCaps(0) - , m_startCaps(0) - , m_renderBuffer(0) - , m_notified(false) - , m_stop(false) - , m_flush(false) { const auto instances = rendererLoader()->instances(QGstVideoRendererPluginKey); for (QObject *instance : instances) { |