diff --git a/ChangeLog b/ChangeLog
index 0352311e3a..98624b4196 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-27  Mark Nauwelaerts  <mark.nauwelaerts@collabora.co.uk>
+
+	* ext/faac/gstfaac.c: (gst_faac_sink_event):
+	Prevent endless loop if buffer alloc error.
+
 2008-10-27  Sebastian Dröge  <sebastian.droege@collabora.co.uk>
 
 	* gst/flv/gstflvdemux.c: (gst_flv_demux_chain),
diff --git a/ext/faac/gstfaac.c b/ext/faac/gstfaac.c
index 487777a034..7782ce5a59 100644
--- a/ext/faac/gstfaac.c
+++ b/ext/faac/gstfaac.c
@@ -501,7 +501,8 @@ gst_faac_sink_event (GstPad * pad, GstEvent * event)
             gst_buffer_unref (outbuf);
             ret = FALSE;
           }
-        }
+        } else
+          ret = FALSE;
       }
       ret = gst_pad_event_default (pad, event);
       break;