From effb5786da04e28effadc0602ef1ec5465458801 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Sun, 22 Mar 2009 15:51:37 +0100 Subject: mxfmux: Fix some memory leaks, improve debugging and handle errors better --- gst/mxf/mxfalaw.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'gst/mxf/mxfalaw.c') diff --git a/gst/mxf/mxfalaw.c b/gst/mxf/mxfalaw.c index db7456cb..52df480f 100644 --- a/gst/mxf/mxfalaw.c +++ b/gst/mxf/mxfalaw.c @@ -196,12 +196,12 @@ mxf_alaw_get_descriptor (GstPadTemplate * tmpl, GstCaps * caps, gint rate, channels; s = gst_caps_get_structure (caps, 0); - if (strcmp (gst_structure_get_name (s), "audio/x-alaw") != 0) - return NULL; - - if (!gst_structure_get_int (s, "rate", &rate) || - !gst_structure_get_int (s, "channels", &channels)) + if (strcmp (gst_structure_get_name (s), "audio/x-alaw") != 0 || + !gst_structure_get_int (s, "rate", &rate) || + !gst_structure_get_int (s, "channels", &channels)) { + GST_ERROR ("Invalid caps %" GST_PTR_FORMAT, caps); return NULL; + } ret = (MXFMetadataGenericSoundEssenceDescriptor *) gst_mini_object_new (MXF_TYPE_METADATA_GENERIC_SOUND_ESSENCE_DESCRIPTOR); @@ -210,7 +210,11 @@ mxf_alaw_get_descriptor (GstPadTemplate * tmpl, GstCaps * caps, memcpy (&ret->sound_essence_compression, &mxf_sound_essence_compression_alaw, 16); - mxf_metadata_generic_sound_essence_descriptor_from_caps (ret, caps); + if (!mxf_metadata_generic_sound_essence_descriptor_from_caps (ret, caps)) { + gst_mini_object_unref (GST_MINI_OBJECT_CAST (ret)); + return NULL; + } + *handler = mxf_alaw_write_func; md = g_new0 (ALawMappingData, 1); -- cgit v1.2.1