From 8412c2a656c37d194d42e52774f9729c531f47b2 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Wed, 20 Oct 2010 17:12:29 +0200 Subject: [PATCH] segment: move g_return_if_fail to where it is needed --- gst/gstsegment.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gst/gstsegment.c b/gst/gstsegment.c index c1527c0..5b10a91 100644 --- a/gst/gstsegment.c +++ b/gst/gstsegment.c @@ -555,12 +555,12 @@ gst_segment_to_stream_time (GstSegment * segment, GstFormat format, gint64 result, start, stop, time; gdouble abs_applied_rate; - g_return_val_if_fail (segment != NULL, -1); - /* format does not matter for -1 */ if (G_UNLIKELY (position == -1)) return -1; + g_return_val_if_fail (segment != NULL, -1); + if (G_UNLIKELY (segment->format == GST_FORMAT_UNDEFINED)) segment->format = format; @@ -641,11 +641,11 @@ gst_segment_to_running_time (GstSegment * segment, GstFormat format, gint64 result; gint64 start, stop, accum; - g_return_val_if_fail (segment != NULL, -1); - if (G_UNLIKELY (position == -1)) return -1; + g_return_val_if_fail (segment != NULL, -1); + if (G_UNLIKELY (segment->format == GST_FORMAT_UNDEFINED)) segment->format = format; -- 2.7.4