From 31ff42de21422e9bb0b07fb9dc07810396867222 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Thu, 25 Jun 2009 11:25:46 +0100 Subject: [PATCH] basesink: don't do things with side effects within a g_assert() Make the bufferlist stuff work properly when things are compiled with -DG_DISABLE_ASSERT. --- libs/gst/base/gstbasesink.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/libs/gst/base/gstbasesink.c b/libs/gst/base/gstbasesink.c index 6fd1fc1..65fbf31 100644 --- a/libs/gst/base/gstbasesink.c +++ b/libs/gst/base/gstbasesink.c @@ -2661,8 +2661,11 @@ gst_base_sink_render_object (GstBaseSink * basesink, GstPad * pad, * for syncing */ GstBufferListIterator *it; + gboolean got_group; + it = gst_buffer_list_iterate (GST_BUFFER_LIST_CAST (obj)); - g_assert (gst_buffer_list_iterator_next_group (it)); + got_group = gst_buffer_list_iterator_next_group (it); + g_assert (got_group); sync_obj = gst_buffer_list_iterator_next (it); gst_buffer_list_iterator_free (it); g_assert (NULL != sync_obj); @@ -2851,8 +2854,11 @@ gst_base_sink_preroll_object (GstBaseSink * basesink, gboolean is_list, if (is_list) { GstBufferListIterator *it; + gboolean got_group; + it = gst_buffer_list_iterate (GST_BUFFER_LIST_CAST (obj)); - g_assert (gst_buffer_list_iterator_next_group (it)); + got_group = gst_buffer_list_iterator_next_group (it); + g_assert (got_group); buf = gst_buffer_list_iterator_next (it); gst_buffer_list_iterator_free (it); g_assert (NULL != buf); @@ -3273,8 +3279,11 @@ gst_base_sink_chain_unlocked (GstBaseSink * basesink, GstPad * pad, if (is_list) { GstBufferListIterator *it; + gboolean got_group; + it = gst_buffer_list_iterate (GST_BUFFER_LIST_CAST (obj)); - g_assert (gst_buffer_list_iterator_next_group (it)); + got_group = gst_buffer_list_iterator_next_group (it); + g_assert (got_group); time_buf = gst_buffer_list_iterator_next (it); gst_buffer_list_iterator_free (it); g_assert (NULL != time_buf); -- 2.7.4