From 6e1679b9cb446e5c4eda0fc0288023b641a4569a Mon Sep 17 00:00:00 2001 From: Edward Hervey Date: Wed, 28 May 2014 15:52:49 +0200 Subject: [PATCH] mpegts: Make some fields optional Some people might just not care about the contents --- gst-libs/gst/mpegts/gst-dvb-descriptor.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gst-libs/gst/mpegts/gst-dvb-descriptor.c b/gst-libs/gst/mpegts/gst-dvb-descriptor.c index f4ea594..376e8cc 100644 --- a/gst-libs/gst/mpegts/gst-dvb-descriptor.c +++ b/gst-libs/gst/mpegts/gst-dvb-descriptor.c @@ -1608,8 +1608,8 @@ gst_mpegts_descriptor_parse_dvb_multilingual_component (const * @descriptor: a %GST_MTS_DESC_DVB_PRIVATE_DATA_SPECIFIER #GstMpegTsDescriptor * @private_data_specifier: (out): the private data specifier id * registered by http://www.dvbservices.com/ - * @private_data: (out): additional data or NULL - * @length: (out): length of %private_data + * @private_data: (out) (allow-none): additional data or NULL + * @length: (out) (allow-none): length of %private_data * * Parses out the private data specifier from the @descriptor. * @@ -1631,10 +1631,11 @@ gst_mpegts_descriptor_parse_dvb_private_data_specifier (const *private_data_specifier = GST_READ_UINT32_BE (data); - *length = descriptor->length - 4; - - *private_data = g_memdup (data + 4, *length); + if (length && private_data) { + *length = descriptor->length - 4; + *private_data = g_memdup (data + 4, *length); + } return TRUE; } -- 2.7.4