diff --git a/ChangeLog b/ChangeLog
index f9ca6c8e27..61ecca5848 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-11-20  Wim Taymans  <wim@fluendo.com>
+
+	* ext/vorbis/vorbisenc.c: (gst_vorbisenc_push_buffer),
+	(gst_vorbisenc_push_packet):
+	GST_PAD_IS_USABLE is gone, use the return value of
+	the push or pad_alloc_buffer instead.
+
 2005-11-18  Julien MOUTTE  <julien@moutte.net>
 
 	* sys/ximage/ximagesink.c: (gst_ximage_buffer_finalize),
diff --git a/ext/vorbis/vorbisenc.c b/ext/vorbis/vorbisenc.c
index 4403b61762..35208ac46b 100644
--- a/ext/vorbis/vorbisenc.c
+++ b/ext/vorbis/vorbisenc.c
@@ -819,25 +819,21 @@ gst_vorbisenc_buffer_from_packet (GstVorbisEnc * vorbisenc, ogg_packet * packet)
 }
 
 /* push out the buffer and do internal bookkeeping */
-static void
+static GstFlowReturn
 gst_vorbisenc_push_buffer (GstVorbisEnc * vorbisenc, GstBuffer * buffer)
 {
   vorbisenc->bytes_out += GST_BUFFER_SIZE (buffer);
 
-  if (GST_PAD_IS_USABLE (vorbisenc->srcpad)) {
-    gst_pad_push (vorbisenc->srcpad, buffer);
-  } else {
-    gst_buffer_unref (buffer);
-  }
+  return gst_pad_push (vorbisenc->srcpad, buffer);
 }
 
-static void
+static GstFlowReturn
 gst_vorbisenc_push_packet (GstVorbisEnc * vorbisenc, ogg_packet * packet)
 {
   GstBuffer *outbuf;
 
   outbuf = gst_vorbisenc_buffer_from_packet (vorbisenc, packet);
-  gst_vorbisenc_push_buffer (vorbisenc, outbuf);
+  return gst_vorbisenc_push_buffer (vorbisenc, outbuf);
 }
 
 static GstCaps *