--- gst/avi/gstavidemux.orig	Sat Jan 21 16:59:33 2006
+++ gst/avi/gstavidemux.c	Sat Jan 21 17:00:16 2006
@@ -2219,10 +2219,10 @@ swap_line (guint8 * d1, guint8 * d2, gui
 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;
--- gst/rtp/gstrtpmp4vdepay.orig	Sat Jan 21 17:04:39 2006
+++ gst/rtp/gstrtpmp4vdepay.c	Sat Jan 21 17:04:59 2006
@@ -132,12 +132,11 @@ gst_rtp_mp4v_depay_setcaps (GstBaseRTPDe
   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);
--- gst/rtsp/sdpmessage.horig	Sat Jan 21 17:08:35 2006
+++ gst/rtsp/sdpmessage.h	Sat Jan 21 17:09:08 2006
@@ -52,7 +52,7 @@
   gchar *start;
   gchar *stop;
   gint   n_repeat;
-  gchar *repeat[];
+  gchar **repeat;
 } SDPTime;
 
 typedef struct {
--- gst/udp/gstmultiudpsink.orig	Sat Jan 21 17:10:40 2006
+++ gst/udp/gstmultiudpsink.c	Sat Jan 21 17:11:01 2006
@@ -462,9 +462,9 @@ gst_multiudpsink_get_stats (GstMultiUDPS
   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 */
--- gst/udp/gstdynudpsink.orig	Sat Jan 21 17:12:03 2006
+++ gst/udp/gstdynudpsink.c	Sat Jan 21 17:12:22 2006
@@ -187,6 +187,8 @@ gst_dynudpsink_render (GstBaseSink * bsi
   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 * bsi
   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);
--- ext/libpng/gstpngenc.orig	Sat Jan 21 17:16:54 2006
+++ ext/libpng/gstpngenc.c	Sat Jan 21 17:17:32 2006
@@ -323,9 +323,11 @@ gst_pngenc_chain (GstPad * pad, GstBuffe
     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);
 
