diff --git a/ChangeLog b/ChangeLog
index 22856559d5..8b46e244b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-10-29  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* ext/dts/gstdtsdec.c: (gst_dtsdec_handle_frame):
+	  Fix flow handling and buffer refcounting (gst_pad_push() takes
+	  ownership of the buffer passed to it, the buffer does not have
+	  to be unreffed no matter what flow value gst_pad_push() returns).
+
 2006-10-26  Edgard Lima <edgard.lima@indt.org.br>
 
 	Patch by: Renato Filho <renato.filho@indt.org.br> 
diff --git a/ext/dts/gstdtsdec.c b/ext/dts/gstdtsdec.c
index 6b913dc6d0..c2b3329c28 100644
--- a/ext/dts/gstdtsdec.c
+++ b/ext/dts/gstdtsdec.c
@@ -435,10 +435,8 @@ gst_dtsdec_handle_frame (GstDtsDec * dts, guint8 * data,
     result = gst_pad_alloc_buffer_and_set_caps (dts->srcpad, 0,
         (SAMPLE_WIDTH / 8) * 256 * num_c, GST_PAD_CAPS (dts->srcpad), &out);
 
-    if (result != GST_FLOW_OK) {
-      GST_ELEMENT_ERROR (dts, RESOURCE, FAILED, (NULL), ("Out of memory"));
-      goto done;
-    }
+    if (result != GST_FLOW_OK)
+      break;
 
     GST_BUFFER_TIMESTAMP (out) = dts->current_ts;
     GST_BUFFER_DURATION (out) = GST_SECOND * 256 / dts->sample_rate;
@@ -457,16 +455,10 @@ gst_dtsdec_handle_frame (GstDtsDec * dts, guint8 * data,
     /* push on */
     result = gst_pad_push (dts->srcpad, out);
 
-    if (result != GST_FLOW_OK) {
-      gst_buffer_unref (out);
-      goto done;
-    }
-
-
+    if (result != GST_FLOW_OK)
+      break;
   }
 
-done:
-
   return result;
 }