diff --git a/ChangeLog b/ChangeLog
index 9b5f334ca1..78cc95c624 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-04-04  Benjamin Otte  <otte@gnome.org>
+
+	* gst/schedulers/gstbasicscheduler.c:
+	(gst_basic_scheduler_pad_select):
+	  fix uninitialized variable warnings
+
 2004-04-04  Benjamin Otte  <otte@gnome.org>
 
 	* gst/gstpad.c: (gst_pad_collect_valist):
diff --git a/gst/schedulers/gstbasicscheduler.c b/gst/schedulers/gstbasicscheduler.c
index 173937ee4c..47e7fd5eca 100644
--- a/gst/schedulers/gstbasicscheduler.c
+++ b/gst/schedulers/gstbasicscheduler.c
@@ -1320,23 +1320,23 @@ static GstData *
 gst_basic_scheduler_pad_select (GstScheduler * sched, GstPad ** selected,
     GstPad ** padlist)
 {
-  GstData *data;
-  GstPad *pad;
-  gint i;
+  GstData *data = NULL;
+  gint i = 0;
 
   GST_INFO ("performing select");
 
   while (padlist[i]) {
-    pad = padlist[i];
+    GstPad *pad = padlist[i];
 
     GST_RPAD_CHAINHANDLER (pad) =
         GST_DEBUG_FUNCPTR (gst_basic_scheduler_select_proxy);
   }
 
-  do_element_switch (GST_PAD_PARENT (GST_PAD_PEER (pad)));
+  do_element_switch (GST_PAD_PARENT (GST_PAD_PEER (padlist[0])));
 
+  i = 0;
   while (padlist[i]) {
-    pad = padlist[i];
+    GstPad *pad = padlist[i];
 
     if (GST_RPAD_BUFPEN (pad)) {
       *selected = pad;
@@ -1348,6 +1348,7 @@ gst_basic_scheduler_pad_select (GstScheduler * sched, GstPad ** selected,
         GST_DEBUG_FUNCPTR (gst_basic_scheduler_chainhandler_proxy);
   }
 
+  g_assert (data != NULL);
   return data;
 }