diff --git a/ChangeLog b/ChangeLog
index 78ec8628aa183ba686a0438a29f762ed1e90bf9e..44a8654016d43610a792414a54aed68e881b4cd2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2006-01-23  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* ext/libpng/gstpngenc.c: (gst_pngenc_chain):
+	* gst/avi/gstavidemux.c: (gst_avi_demux_invert):
+	* gst/rtp/gstrtpmp4vdepay.c: (gst_rtp_mp4v_depay_setcaps):
+	* gst/rtsp/sdpmessage.h:
+	* gst/udp/gstdynudpsink.c: (gst_dynudpsink_render):
+	* gst/udp/gstmultiudpsink.c: (gst_multiudpsink_get_stats):
+	  C89 fixes: declare variables at the beginning of a block and
+	  make gcc-2.9x happy (#328264; patch by: Jens Granseuer
+	  <jensgr at gmx dot net>).
+
 2006-01-23  Jan Schmidt  <thaytan@mad.scientist.com>
 
 	* gst/id3demux/id3tags.c: (id3demux_read_id3v2_tag):
diff --git a/ext/libpng/gstpngenc.c b/ext/libpng/gstpngenc.c
index eee5132482e6e915e0ec4d5440597f21dac27e7b..190ffbb3392948be7867ab8845792ad620c711a4 100644
--- a/ext/libpng/gstpngenc.c
+++ b/ext/libpng/gstpngenc.c
@@ -323,9 +323,11 @@ gst_pngenc_chain (GstPad * pad, GstBuffer * buf)
     goto done;
 
   if (pngenc->snapshot) {
+    GstEvent *event;
+
     GST_DEBUG_OBJECT (pngenc, "snapshot mode, sending EOS");
     /* send EOS event, since a frame has been pushed out */
-    GstEvent *event = gst_event_new_eos ();
+    event = gst_event_new_eos ();
 
     ret = gst_pad_push_event (pngenc->srcpad, event);
 
diff --git a/gst/avi/gstavidemux.c b/gst/avi/gstavidemux.c
index 7232fd177716a6fdb0f6b7e519aad49fd87d8110..d6055527255feffdd89ee2ad37f160bd2ba1f9bf 100644
--- a/gst/avi/gstavidemux.c
+++ b/gst/avi/gstavidemux.c
@@ -2219,10 +2219,10 @@ swap_line (guint8 * d1, guint8 * d2, guint8 * tmp, gint bytes)
 static GstBuffer *
 gst_avi_demux_invert (avi_stream_context * stream, GstBuffer * buf)
 {
-  buf = gst_buffer_make_writable (buf);
   gint y, h = stream->strf.vids->height, w = stream->strf.vids->width;
   guint8 *tmp = NULL;
 
+  buf = gst_buffer_make_writable (buf);
   if (GST_BUFFER_SIZE (buf) < (w * h)) {
     GST_WARNING ("Buffer is smaller than reported Width x Height");
     return buf;
diff --git a/gst/rtp/gstrtpmp4vdepay.c b/gst/rtp/gstrtpmp4vdepay.c
index 551049b7018d4dfd4ecd463847acfeb4a96e7516..3582a3026d3c3c31712d1e46a76cdd10140975f2 100644
--- a/gst/rtp/gstrtpmp4vdepay.c
+++ b/gst/rtp/gstrtpmp4vdepay.c
@@ -132,13 +132,12 @@ gst_rtp_mp4v_depay_setcaps (GstBaseRTPDepayload * depayload, GstCaps * caps)
   GstRtpMP4VDepay *rtpmp4vdepay;
   GstCaps *srccaps;
   const gchar *str;
+  gint clock_rate = 90000;      /* default */
 
   rtpmp4vdepay = GST_RTP_MP4V_DEPAY (depayload);
 
   structure = gst_caps_get_structure (caps, 0);
 
-  gint clock_rate = 90000;      // default
-
   if (gst_structure_has_field (structure, "clock-rate")) {
     gst_structure_get_int (structure, "clock-rate", &clock_rate);
   }
diff --git a/gst/rtsp/sdpmessage.h b/gst/rtsp/sdpmessage.h
index e50a9ee963c6e1ecfd5412dda3cecadf1b534c3f..22c5b1d3ab74daab1f6562478522af3c2de1e886 100644
--- a/gst/rtsp/sdpmessage.h
+++ b/gst/rtsp/sdpmessage.h
@@ -52,7 +52,7 @@ typedef struct {
   gchar *start;
   gchar *stop;
   gint   n_repeat;
-  gchar *repeat[];
+  gchar **repeat;
 } SDPTime;
 
 typedef struct {
diff --git a/gst/udp/gstdynudpsink.c b/gst/udp/gstdynudpsink.c
index e7be3b229a994d9c2a2879586be6608348e45ca2..2668016845b5ab3457e1fe73f37966d46ef30dcf 100644
--- a/gst/udp/gstdynudpsink.c
+++ b/gst/udp/gstdynudpsink.c
@@ -187,6 +187,8 @@ gst_dynudpsink_render (GstBaseSink * bsink, GstBuffer * buffer)
   guint8 *data;
   GstNetBuffer *netbuf;
   struct sockaddr_in theiraddr;
+  guint16 destport;
+  guint32 destaddr;
 
   memset (&theiraddr, 0, sizeof (theiraddr));
 
@@ -203,8 +205,6 @@ gst_dynudpsink_render (GstBaseSink * bsink, GstBuffer * buffer)
   data = GST_BUFFER_DATA (netbuf);
 
   GST_DEBUG ("about to send %d bytes", size);
-  guint16 destport;
-  guint32 destaddr;
 
   // let's get the address from the netbuffer
   gst_netaddress_get_ip4_address (&netbuf->to, &destaddr, &destport);
diff --git a/gst/udp/gstmultiudpsink.c b/gst/udp/gstmultiudpsink.c
index ed9be9e1b283d0981c8562d8793680d4db91ba48..bcc81128f73697a5c41442773cb5e889d94e0ae5 100644
--- a/gst/udp/gstmultiudpsink.c
+++ b/gst/udp/gstmultiudpsink.c
@@ -462,10 +462,10 @@ gst_multiudpsink_get_stats (GstMultiUDPSink * sink, const gchar * host,
   find = g_list_find_custom (sink->clients, &udpclient,
       (GCompareFunc) client_compare);
   if (find) {
-    client = (GstUDPClient *) find->data;
-
     GValue value = { 0 };
 
+    client = (GstUDPClient *) find->data;
+
     /* Result is a value array of (bytes_sent, packets_sent, 
      * connect_time, disconnect_time), all as uint64 */
     result = g_value_array_new (4);