mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-07 07:58:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst-libs/gst/dshow/gstdshowfakesink.*: Fix crasher in constructor due to the base class's constructor not necessarily...

Browse source 
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).
This commit is contained in:
Ole André Vadla Ravnås 2007-11-04 11:04:28 +00:00 committed by Tim-Philipp Müller
parent f627f21233
commit 209d6105d7
5 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
ChangeLog
View file

@ -1,3 +1,18 @@
2007-11-04 Tim-Philipp Müller <tim at centricular dot net>
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).
2007-11-03 Sebastian Dröge <slomo@circular-chaos.org> 2007-11-03 Sebastian Dröge <slomo@circular-chaos.org>
* gst/equalizer/demo.c: (main): * gst/equalizer/demo.c: (main):

3
gst-libs/gst/dshow/gstdshowfakesink.cpp
View file

@ -22,7 +22,8 @@
#include "gstdshowfakesink.h" #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; m_callback = NULL;
} }

1
gst-libs/gst/dshow/gstdshowfakesink.h
View file

@ -43,6 +43,7 @@ public:
STDMETHOD (gst_set_sample_size) (unsigned int size); STDMETHOD (gst_set_sample_size) (unsigned int size);
protected: protected:
HRESULT m_hres;
CMediaType m_MediaType; CMediaType m_MediaType;
push_buffer_func m_callback; push_buffer_func m_callback;
byte *m_data; byte *m_data;

2
sys/dshowsrcwrapper/gstdshowaudiosrc.c
View file

@ -641,7 +641,7 @@ gst_dshowaudiosrc_prepare (GstAudioSrc * asrc, GstRingBufferSpec * spec)
IGstDshowInterface_gst_set_media_type (srcinterface, IGstDshowInterface_gst_set_media_type (srcinterface,
pin_mediatype->mediatype); pin_mediatype->mediatype);
IGstDshowInterface_gst_set_buffer_callback (srcinterface, IGstDshowInterface_gst_set_buffer_callback (srcinterface,
gst_dshowaudiosrc_push_buffer, (byte *) src); (byte *) gst_dshowaudiosrc_push_buffer, (byte *) src);
if (srcinterface) { if (srcinterface) {
IGstDshowInterface_Release (srcinterface); IGstDshowInterface_Release (srcinterface);

2
sys/dshowsrcwrapper/gstdshowvideosrc.c
View file

@ -688,7 +688,7 @@ gst_dshowvideosrc_set_caps (GstBaseSrc * bsrc, GstCaps * caps)
IGstDshowInterface_gst_set_media_type (srcinterface, IGstDshowInterface_gst_set_media_type (srcinterface,
pin_mediatype->mediatype); pin_mediatype->mediatype);
IGstDshowInterface_gst_set_buffer_callback (srcinterface, IGstDshowInterface_gst_set_buffer_callback (srcinterface,
gst_dshowvideosrc_push_buffer, (byte *) src); (byte *) gst_dshowvideosrc_push_buffer, (byte *) src);
if (srcinterface) { if (srcinterface) {
IGstDshowInterface_Release (srcinterface); IGstDshowInterface_Release (srcinterface);