From 931354215eac232a9a023fccdfa01244bbbb8671 Mon Sep 17 00:00:00 2001
From: Stefan Sauer <ensonic@users.sf.net>
Date: Tue, 8 Nov 2011 08:50:19 +0100
Subject: [PATCH] goom: code cleanups

Move variables to the scope where they are needed. Use our macros and functions
more.
---
 gst/goom/gstgoom.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/gst/goom/gstgoom.c b/gst/goom/gstgoom.c
index ea0d8d5bb7..df50cea321 100644
--- a/gst/goom/gstgoom.c
+++ b/gst/goom/gstgoom.c
@@ -543,7 +543,6 @@ gst_goom_chain (GstPad * pad, GstBuffer * buffer)
 
   while (TRUE) {
     const guint16 *data;
-    gboolean need_skip;
     guchar *out_frame;
     gint i;
     guint avail, to_flush;
@@ -570,12 +569,12 @@ gst_goom_chain (GstPad * pad, GstBuffer * buffer)
       timestamp += gst_util_uint64_scale_int (dist, GST_SECOND, goom->rate);
     }
 
-    if (timestamp != -1) {
+    if (GST_CLOCK_TIME_IS_VALID (timestamp)) {
       gint64 qostime;
+      gboolean need_skip;
 
       qostime = gst_segment_to_running_time (&goom->segment, GST_FORMAT_TIME,
-          timestamp);
-      qostime += goom->duration;
+          timestamp) + goom->duration;
 
       GST_OBJECT_LOCK (goom);
       /* check for QoS, don't compute buffers that are known to be late */
@@ -677,8 +676,7 @@ gst_goom_change_state (GstElement * element, GstStateChange transition)
     case GST_STATE_CHANGE_PAUSED_TO_READY:
       if (goom->pool) {
         gst_buffer_pool_set_active (goom->pool, FALSE);
-        gst_object_unref (goom->pool);
-        goom->pool = NULL;
+        gst_object_replace ((GstObject **) & goom->pool, NULL);
       }
       break;
     case GST_STATE_CHANGE_READY_TO_NULL: