summaryrefslogtreecommitdiff
path: root/gst-libs
diff options
context:
space:
mode:
authorOle André Vadla Ravnås <ole.andre.ravnas@tandberg.com>2007-11-04 11:04:28 +0000
committerTim-Philipp Müller <tim@centricular.net>2007-11-04 11:04:28 +0000
commit209d6105d73bcdb01f20432035fc58436caa26b7 (patch)
treea205fb49b07756c851b00a2319ad7e3174a0a4e2 /gst-libs
parentf627f21233890b35e0420171c67b2b380108da73 (diff)
downloadgstreamer-plugins-bad-209d6105d73bcdb01f20432035fc58436caa26b7.tar.gz
gst-libs/gst/dshow/gstdshowfakesink.*: Fix crasher in constructor due to the base class's constructor not necessarily...
Original commit message from CVS: Patch by: Ole André Vadla Ravnås <ole.andre.ravnas@tandberg.com> * gst-libs/gst/dshow/gstdshowfakesink.cpp: (CDshowFakeSink.CDshowFakeSink): * gst-libs/gst/dshow/gstdshowfakesink.h: (CDshowFakeSink.m_hres): Fix crasher in constructor due to the base class's constructor not necessarily being NULL-safe (depends on the SDK version used apparently; #492406). * sys/dshowsrcwrapper/gstdshowaudiosrc.c: (gst_dshowaudiosrc_prepare): * sys/dshowsrcwrapper/gstdshowvideosrc.c: (gst_dshowvideosrc_set_caps): Fix a couple of MSVC compiler warnings (#492406).
Diffstat (limited to 'gst-libs')
-rw-r--r--gst-libs/gst/dshow/gstdshowfakesink.cpp3
-rw-r--r--gst-libs/gst/dshow/gstdshowfakesink.h1
2 files changed, 3 insertions, 1 deletions
diff --git a/gst-libs/gst/dshow/gstdshowfakesink.cpp b/gst-libs/gst/dshow/gstdshowfakesink.cpp
index 58b237187..e3a5f0b9f 100644
--- a/gst-libs/gst/dshow/gstdshowfakesink.cpp
+++ b/gst-libs/gst/dshow/gstdshowfakesink.cpp
@@ -22,7 +22,8 @@
#include "gstdshowfakesink.h"
-CDshowFakeSink::CDshowFakeSink():CBaseRenderer(CLSID_DshowFakeSink, "DshowFakeSink", NULL, NULL)
+CDshowFakeSink::CDshowFakeSink()
+ : m_hres(S_OK), CBaseRenderer(CLSID_DshowFakeSink, "DshowFakeSink", NULL, &m_hres)
{
m_callback = NULL;
}
diff --git a/gst-libs/gst/dshow/gstdshowfakesink.h b/gst-libs/gst/dshow/gstdshowfakesink.h
index b53a6898d..7f419b278 100644
--- a/gst-libs/gst/dshow/gstdshowfakesink.h
+++ b/gst-libs/gst/dshow/gstdshowfakesink.h
@@ -43,6 +43,7 @@ public:
STDMETHOD (gst_set_sample_size) (unsigned int size);
protected:
+ HRESULT m_hres;
CMediaType m_MediaType;
push_buffer_func m_callback;
byte *m_data;