summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Reiter <reiter.christoph@gmail.com>2018-05-22 22:12:34 +0200
committerNirbheek Chauhan <nirbheek@centricular.com>2018-05-23 13:25:59 +0530
commitaa77cac8ecd9f2b736c5b9278c453114c14efcd3 (patch)
tree7500700df78b9832b3135923c2bf044824d4a762
parentfd178617d0fc3bed781d566def792f90d7825d01 (diff)
downloadgstreamer-plugins-bad-aa77cac8ecd9f2b736c5b9278c453114c14efcd3.tar.gz
wasapi: Don't pass CoTaskMemFree to g_clear_pointer
CoTaskMemFree has a different calling convention than GDestroyNotify and things crash at least with MinGW. https://bugzilla.gnome.org/show_bug.cgi?id=796280
-rw-r--r--sys/wasapi/gstwasapisink.c3
-rw-r--r--sys/wasapi/gstwasapisrc.c3
2 files changed, 4 insertions, 2 deletions
diff --git a/sys/wasapi/gstwasapisink.c b/sys/wasapi/gstwasapisink.c
index e06f07a18..fc5a32f30 100644
--- a/sys/wasapi/gstwasapisink.c
+++ b/sys/wasapi/gstwasapisink.c
@@ -208,7 +208,8 @@ gst_wasapi_sink_finalize (GObject * object)
{
GstWasapiSink *self = GST_WASAPI_SINK (object);
- g_clear_pointer (&self->mix_format, CoTaskMemFree);
+ CoTaskMemFree (self->mix_format);
+ self->mix_format = NULL;
if (self->cached_caps != NULL) {
gst_caps_unref (self->cached_caps);
diff --git a/sys/wasapi/gstwasapisrc.c b/sys/wasapi/gstwasapisrc.c
index 1dbbc8239..bf52062cd 100644
--- a/sys/wasapi/gstwasapisrc.c
+++ b/sys/wasapi/gstwasapisrc.c
@@ -218,7 +218,8 @@ gst_wasapi_src_finalize (GObject * object)
{
GstWasapiSrc *self = GST_WASAPI_SRC (object);
- g_clear_pointer (&self->mix_format, CoTaskMemFree);
+ CoTaskMemFree (self->mix_format);
+ self->mix_format = NULL;
g_clear_pointer (&self->cached_caps, gst_caps_unref);
g_clear_pointer (&self->positions, g_free);