mpegtsmux: Don't use g_list_first ()

Seriously ...

3 files changed, 7 insertions, 11 deletions

diff --git a/gst/mpegtsmux/mpegtsmux.c b/gst/mpegtsmux/mpegtsmux.c
index bc36f4686..a696408d3 100644
--- a/gst/mpegtsmux/mpegtsmux.c
+++ b/gst/mpegtsmux/mpegtsmux.c
@@ -944,8 +944,7 @@ mpegtsmux_collected (GstCollectPads2 * pads, MpegTsMux * mux)
         mux->tsmux->last_pat_ts = -1;
 
         /* output PMT for each program */
-        for (cur = g_list_first (mux->tsmux->programs); cur != NULL;
-            cur = g_list_next (cur)) {
+        for (cur = mux->tsmux->programs; cur; cur = cur->next) {
           TsMuxProgram *program = (TsMuxProgram *) cur->data;
 
           program->last_pmt_ts = -1;
diff --git a/gst/mpegtsmux/tsmux/tsmux.c b/gst/mpegtsmux/tsmux/tsmux.c
index 72095d0ce..4e5a196d1 100644
--- a/gst/mpegtsmux/tsmux/tsmux.c
+++ b/gst/mpegtsmux/tsmux/tsmux.c
@@ -206,7 +206,7 @@ tsmux_free (TsMux * mux)
   g_return_if_fail (mux != NULL);
 
   /* Free all programs */
-  for (cur = g_list_first (mux->programs); cur != NULL; cur = g_list_next (cur)) {
+  for (cur = mux->programs; cur; cur = cur->next) {
     TsMuxProgram *program = (TsMuxProgram *) cur->data;
 
     tsmux_program_free (program);
@@ -214,7 +214,7 @@ tsmux_free (TsMux * mux)
   g_list_free (mux->programs);
 
   /* Free all streams */
-  for (cur = g_list_first (mux->streams); cur != NULL; cur = g_list_next (cur)) {
+  for (cur = mux->streams; cur; cur = cur->next) {
     TsMuxStream *stream = (TsMuxStream *) cur->data;
 
     tsmux_stream_free (stream);
@@ -417,7 +417,7 @@ tsmux_find_stream (TsMux * mux, guint16 pid)
 
   g_return_val_if_fail (mux != NULL, NULL);
 
-  for (cur = g_list_first (mux->streams); cur != NULL; cur = g_list_next (cur)) {
+  for (cur = mux->streams; cur; cur = cur->next) {
     TsMuxStream *stream = (TsMuxStream *) cur->data;
 
     if (tsmux_stream_get_pid (stream) == pid) {
@@ -749,8 +749,7 @@ tsmux_write_stream_packet (TsMux * mux, TsMuxStream * stream)
     }
 
     /* check if we need to rewrite any of the current pmts */
-    for (cur = g_list_first (mux->programs); cur != NULL;
-        cur = g_list_next (cur)) {
+    for (cur = mux->programs; cur; cur = cur->next) {
       TsMuxProgram *program = (TsMuxProgram *) cur->data;
       gboolean write_pmt;
 
@@ -915,8 +914,7 @@ tsmux_write_pat (TsMux * mux)
     /* Prepare the section data after the section header */
     pos = pat->data + TSMUX_SECTION_HDR_SIZE;
 
-    for (cur = g_list_first (mux->programs); cur != NULL;
-        cur = g_list_next (cur)) {
+    for (cur = mux->programs; cur; cur = cur->next) {
       TsMuxProgram *program = (TsMuxProgram *) cur->data;
 
       tsmux_put16 (&pos, program->pgm_number);
diff --git a/gst/mpegtsmux/tsmux/tsmuxstream.c b/gst/mpegtsmux/tsmux/tsmuxstream.c
index 28112e134..a57cb41e2 100644
--- a/gst/mpegtsmux/tsmux/tsmuxstream.c
+++ b/gst/mpegtsmux/tsmux/tsmuxstream.c
@@ -506,8 +506,7 @@ tsmux_stream_find_pts_dts_within (TsMuxStream * stream, guint bound,
   *pts = -1;
   *dts = -1;
 
-  for (cur = g_list_first (stream->buffers); cur != NULL;
-      cur = g_list_next (cur)) {
+  for (cur = stream->buffers; cur; cur = cur->next) {
     TsMuxStreamBuffer *curbuf = cur->data;
 
     /* FIXME: This isn't quite correct - if the 'bound' is within this