diff --git a/ChangeLog b/ChangeLog
index be6de7123a..b7f6c8c55a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-11-03  Sebastian Dröge  <sebastian.droege@collabora.co.uk>
+
+	* gst/speexresample/gstspeexresample.c:
+	(gst_speex_resample_convert_buffer):
+	Add TODO at the top of the file for enabling SSE/ARM specific
+	optimizations and choosing the fastest implementation at runtime.
+
+	Add g_assert_not_reached() at two places that should really never
+	be reached.
+
 2008-11-02  Sebastian Dröge  <sebastian.droege@collabora.co.uk>
 
 	* gst/speexresample/gstspeexresample.c:
diff --git a/gst/speexresample/gstspeexresample.c b/gst/speexresample/gstspeexresample.c
index 84057e642f..010991d68b 100644
--- a/gst/speexresample/gstspeexresample.c
+++ b/gst/speexresample/gstspeexresample.c
@@ -34,6 +34,10 @@
  * </refsect2>
  */
 
+/* TODO:
+ *  - Enable SSE/ARM optimizations and select at runtime
+ */
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -640,6 +644,8 @@ gst_speex_resample_convert_buffer (GstSpeexResample * resample,
         i++;
         len--;
       }
+    } else {
+      g_assert_not_reached ();
     }
   } else {
     if (gst_speex_resample_use_int && resample->width == 8 && !resample->fp) {
@@ -708,6 +714,8 @@ gst_speex_resample_convert_buffer (GstSpeexResample * resample,
         i++;
         len--;
       }
+    } else {
+      g_assert_not_reached ();
     }
   }
 }