diff options
| author | Ole André Vadla Ravnås <ole.andre.ravnas@tandberg.com> | 2007-11-04 11:04:28 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.net> | 2007-11-04 11:04:28 +0000 |
| commit | 209d6105d73bcdb01f20432035fc58436caa26b7 (patch) | |
| tree | a205fb49b07756c851b00a2319ad7e3174a0a4e2 /sys | |
| parent | f627f21233890b35e0420171c67b2b380108da73 (diff) | |
| download | gst-plugins-bad-209d6105d73bcdb01f20432035fc58436caa26b7.tar.gz gst-plugins-bad-209d6105d73bcdb01f20432035fc58436caa26b7.tar.bz2 gst-plugins-bad-209d6105d73bcdb01f20432035fc58436caa26b7.zip | |
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 'sys')
| -rw-r--r-- | sys/dshowsrcwrapper/gstdshowaudiosrc.c | 2 | ||||
| -rw-r--r-- | sys/dshowsrcwrapper/gstdshowvideosrc.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sys/dshowsrcwrapper/gstdshowaudiosrc.c b/sys/dshowsrcwrapper/gstdshowaudiosrc.c index 4d960e64..c39aaa7f 100644 --- a/sys/dshowsrcwrapper/gstdshowaudiosrc.c +++ b/sys/dshowsrcwrapper/gstdshowaudiosrc.c @@ -641,7 +641,7 @@ gst_dshowaudiosrc_prepare (GstAudioSrc * asrc, GstRingBufferSpec * spec) IGstDshowInterface_gst_set_media_type (srcinterface, pin_mediatype->mediatype); IGstDshowInterface_gst_set_buffer_callback (srcinterface, - gst_dshowaudiosrc_push_buffer, (byte *) src); + (byte *) gst_dshowaudiosrc_push_buffer, (byte *) src); if (srcinterface) { IGstDshowInterface_Release (srcinterface); diff --git a/sys/dshowsrcwrapper/gstdshowvideosrc.c b/sys/dshowsrcwrapper/gstdshowvideosrc.c index 72fbc58b..a1cef889 100644 --- a/sys/dshowsrcwrapper/gstdshowvideosrc.c +++ b/sys/dshowsrcwrapper/gstdshowvideosrc.c @@ -688,7 +688,7 @@ gst_dshowvideosrc_set_caps (GstBaseSrc * bsrc, GstCaps * caps) IGstDshowInterface_gst_set_media_type (srcinterface, pin_mediatype->mediatype); IGstDshowInterface_gst_set_buffer_callback (srcinterface, - gst_dshowvideosrc_push_buffer, (byte *) src); + (byte *) gst_dshowvideosrc_push_buffer, (byte *) src); if (srcinterface) { IGstDshowInterface_Release (srcinterface); |