glshader, tsdemux: simplify code
authorTim-Philipp Müller <tim@centricular.com>
Fri, 6 Nov 2015 12:31:09 +0000 (12:31 +0000)
committerTim-Philipp Müller <tim@centricular.com>
Fri, 6 Nov 2015 13:00:55 +0000 (13:00 +0000)
Jus use _delete_link() instead of _remove_link() + _free1()

gst-libs/gst/gl/gstglshader.c
gst/mpegtsdemux/mpegtsparse.c

index fdaf2fc..cbd300d 100644 (file)
@@ -408,9 +408,8 @@ gst_gl_shader_detach_unlocked (GstGLShader * shader, GstGLSLStage * stage)
   shader->priv->vtable.DetachShader (shader->priv->program_handle,
       stage_handle);
 
-  shader->priv->stages = g_list_remove_link (shader->priv->stages, elem);
+  shader->priv->stages = g_list_delete_link (shader->priv->stages, elem);
   gst_object_unref (stage);
-  g_list_free_1 (elem);
 }
 
 /**
index 743da4f..6e4faf5 100644 (file)
@@ -825,8 +825,7 @@ drain_pending_buffers (MpegTSParse2 * parse, gboolean drain_all)
 
     /* Free this list node and move to the next */
     p = g_list_previous (l);
-    parse->pending_buffers = g_list_remove_link (parse->pending_buffers, l);
-    g_list_free_1 (l);
+    parse->pending_buffers = g_list_delete_link (parse->pending_buffers, l);
     l = p;
   }