summaryrefslogtreecommitdiffstats
path: root/gst/mpegtsmux/tsmux/tsmux.c
diff options
context:
space:
mode:
authorSebastian Dröge <slomo@circular-chaos.org>2008-09-01 17:49:59 +0000
committerSebastian Dröge <slomo@circular-chaos.org>2008-09-01 17:49:59 +0000
commit7ac077828f3fed0104757f2ce2407d69417823ea (patch)
tree0fa7df98f4d726d4b3a8bffbce108bf562fe19be /gst/mpegtsmux/tsmux/tsmux.c
parentb24d38315f03bdc84700e4da4bbd62563c9c0f1f (diff)
downloadgst-plugins-bad-7ac077828f3fed0104757f2ce2407d69417823ea.tar.gz
gst-plugins-bad-7ac077828f3fed0104757f2ce2407d69417823ea.tar.bz2
gst-plugins-bad-7ac077828f3fed0104757f2ce2407d69417823ea.zip
gst/mpegtsmux/mpegtsmux_aac.c: Allocate a fixed size buffer on the stack instead of using malloc().
Original commit message from CVS: * gst/mpegtsmux/mpegtsmux_aac.c: (mpegtsmux_prepare_aac): Allocate a fixed size buffer on the stack instead of using malloc(). * gst/mpegtsmux/tsmux/tsmux.c: (tsmux_new), (tsmux_free), (tsmux_program_new), (tsmux_program_free): * gst/mpegtsmux/tsmux/tsmuxstream.c: (tsmux_stream_new), (tsmux_stream_free), (tsmux_stream_consume), (tsmux_stream_add_data): Use GSlice.
Diffstat (limited to 'gst/mpegtsmux/tsmux/tsmux.c')
-rw-r--r--gst/mpegtsmux/tsmux/tsmux.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/gst/mpegtsmux/tsmux/tsmux.c b/gst/mpegtsmux/tsmux/tsmux.c
index 0952f699..ffb92388 100644
--- a/gst/mpegtsmux/tsmux/tsmux.c
+++ b/gst/mpegtsmux/tsmux/tsmux.c
@@ -130,7 +130,7 @@ tsmux_new ()
{
TsMux *mux;
- mux = g_new0 (TsMux, 1);
+ mux = g_slice_new0 (TsMux);
mux->transport_id = TSMUX_DEFAULT_TS_ID;
@@ -229,7 +229,7 @@ tsmux_free (TsMux * mux)
}
g_list_free (mux->streams);
- g_free (mux);
+ g_slice_free (TsMux, mux);
}
/**
@@ -252,7 +252,7 @@ tsmux_program_new (TsMux * mux)
if (mux->nb_programs == TSMUX_MAX_PROGRAMS)
return NULL;
- program = g_new0 (TsMuxProgram, 1);
+ program = g_slice_new0 (TsMuxProgram);
program->pmt_changed = TRUE;
program->last_pmt_ts = -1;
@@ -811,7 +811,7 @@ tsmux_program_free (TsMuxProgram * program)
g_return_if_fail (program != NULL);
g_array_free (program->streams, TRUE);
- g_free (program);
+ g_slice_free (TsMuxProgram, program);
}
static gboolean