From bf34bdd3ab4573a2fd7955e1463f79af18b8d5e8 Mon Sep 17 00:00:00 2001 From: Zaheer Abbas Merali Date: Sun, 20 Sep 2009 17:53:24 +0100 Subject: [PATCH] Revert "mpegtsparse: use fixed size array rather than dynamically allocating" This reverts commit ae75b6f3666512887ae526f16a1ad41bbf2517ac. --- gst/mpegdemux/mpegtspacketizer.c | 3 ++- gst/mpegdemux/mpegtspacketizer.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/gst/mpegdemux/mpegtspacketizer.c b/gst/mpegdemux/mpegtspacketizer.c index 9de766efd7..53fe8f2482 100644 --- a/gst/mpegdemux/mpegtspacketizer.c +++ b/gst/mpegdemux/mpegtspacketizer.c @@ -155,7 +155,7 @@ static void mpegts_packetizer_init (MpegTSPacketizer * packetizer) { packetizer->adapter = gst_adapter_new (); - memset (packetizer->streams, 0, 8192); + packetizer->streams = g_new0 (MpegTSPacketizerStream *, 8192); packetizer->know_packet_size = FALSE; } @@ -176,6 +176,7 @@ mpegts_packetizer_dispose (GObject * object) if (packetizer->streams[i]) mpegts_packetizer_stream_free (packetizer->streams[i]); } + g_free (packetizer->streams); } gst_adapter_clear (packetizer->adapter); diff --git a/gst/mpegdemux/mpegtspacketizer.h b/gst/mpegdemux/mpegtspacketizer.h index 764dc01802..1f82848aef 100644 --- a/gst/mpegdemux/mpegtspacketizer.h +++ b/gst/mpegdemux/mpegtspacketizer.h @@ -67,7 +67,7 @@ struct _MpegTSPacketizer { GstAdapter *adapter; /* streams hashed by pid */ - MpegTSPacketizerStream *streams[8192]; + MpegTSPacketizerStream **streams; gboolean disposed; gboolean know_packet_size; guint16 packet_size;