diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-19 21:56:59 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-19 21:57:05 +0200 |
commit | d5babf5976fcf86af6cbbf2c5e354767d1f4c612 (patch) | |
tree | a3594868bba2619613b09e14be5b66063ec4f188 /src/gsttools/qgstreamerbufferprobe_p.h | |
parent | 18e6110dfdfd62cc0032f8e43586d075f15299f0 (diff) | |
parent | 22b2e53d00cfdb9ee7400fc4c55aa021a9166e0c (diff) |
Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"
Diffstat (limited to 'src/gsttools/qgstreamerbufferprobe_p.h')
-rw-r--r-- | src/gsttools/qgstreamerbufferprobe_p.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gsttools/qgstreamerbufferprobe_p.h b/src/gsttools/qgstreamerbufferprobe_p.h index 35644f934..2dda73e40 100644 --- a/src/gsttools/qgstreamerbufferprobe_p.h +++ b/src/gsttools/qgstreamerbufferprobe_p.h @@ -83,12 +83,12 @@ private: #if GST_CHECK_VERSION(1,0,0) static GstPadProbeReturn capsProbe(GstPad *pad, GstPadProbeInfo *info, gpointer user_data); static GstPadProbeReturn bufferProbe(GstPad *pad, GstPadProbeInfo *info, gpointer user_data); - int m_capsProbeId; + int m_capsProbeId = -1; #else static gboolean bufferProbe(GstElement *element, GstBuffer *buffer, gpointer user_data); - GstCaps *m_caps; + GstCaps *m_caps = nullptr; #endif - int m_bufferProbeId; + int m_bufferProbeId = -1; const Flags m_flags; }; |