diff --git a/gst/avi/gstavidemux.c b/gst/avi/gstavidemux.c
index 10afe553d9..7c9bd46221 100644
--- a/gst/avi/gstavidemux.c
+++ b/gst/avi/gstavidemux.c
@@ -285,10 +285,12 @@ static gboolean
 gst_avi_demux_avih (GstAviDemux *avi_demux)
 {
   gst_riff_avih *avih;
+  guint8 *avihdata;
   GstByteStream  *bs = avi_demux->bs;
   guint32 got_bytes;
 
-  got_bytes = gst_bytestream_peek_bytes (bs, (guint8 **)&avih, sizeof (gst_riff_avih));
+  got_bytes = gst_bytestream_peek_bytes (bs, &avihdata, sizeof (gst_riff_avih));
+  avih = (gst_riff_avih *) avihdata;
 
   if (got_bytes == sizeof (gst_riff_avih)) {
     avi_demux->avih.us_frame 	= GUINT32_FROM_LE (avih->us_frame);
@@ -331,10 +333,12 @@ static gboolean
 gst_avi_demux_strh (GstAviDemux *avi_demux)
 {
   gst_riff_strh *strh;
+  guint8 *strhdata;
   GstByteStream  *bs = avi_demux->bs;
   guint32 got_bytes;
 
-  got_bytes = gst_bytestream_peek_bytes (bs, (guint8 **)&strh, sizeof (gst_riff_strh));
+  got_bytes = gst_bytestream_peek_bytes (bs, &strhdata, sizeof (gst_riff_strh));
+  strh = (gst_riff_strh *) strhdata;
 
   if (got_bytes == sizeof (gst_riff_strh)) {
     avi_stream_context *target;
@@ -399,20 +403,24 @@ static void
 gst_avi_demux_dmlh (GstAviDemux *avi_demux)
 {
   gst_riff_dmlh *dmlh;
+  guint8 *dmlhdata;
   GstByteStream  *bs = avi_demux->bs;
   guint32 got_bytes;
 
-  got_bytes = gst_bytestream_peek_bytes (bs, (guint8 **)&dmlh, sizeof (gst_riff_dmlh));
+  got_bytes = gst_bytestream_peek_bytes (bs, &dmlhdata, sizeof (gst_riff_dmlh));
+  dmlh = (gst_riff_dmlh *) dmlhdata;
 }
 
 static void
 gst_avi_demux_strn (GstAviDemux *avi_demux, gint len)
 {
   gchar *name;
+  guint8 *namedata;
   GstByteStream  *bs = avi_demux->bs;
   guint32 got_bytes;
 
-  got_bytes = gst_bytestream_peek_bytes (bs, (guint8 **)&name, len);
+  got_bytes = gst_bytestream_peek_bytes (bs, &namedata, len);
+  name = (gchar *) namedata;
   if (got_bytes != len)
     return;
 
@@ -425,6 +433,7 @@ gst_avi_demux_metadata (GstAviDemux *avi_demux, gint len)
   guint32 got_bytes;
   GstByteStream  *bs = avi_demux->bs;
   gst_riff_chunk *temp_chunk, chunk;
+  guint8 *tempdata;
   gchar *name, *type;
   GstProps *props;
   GstPropsEntry *entry;
@@ -432,8 +441,9 @@ gst_avi_demux_metadata (GstAviDemux *avi_demux, gint len)
   props = gst_props_empty_new ();
 
   while (len > 0) {
-    got_bytes = gst_bytestream_peek_bytes (bs, (guint8**)&temp_chunk, sizeof (gst_riff_chunk));
-
+    got_bytes = gst_bytestream_peek_bytes (bs, &tempdata, sizeof (gst_riff_chunk));
+    temp_chunk = (gst_riff_chunk *) tempdata;
+    
     /* fixup for our big endian friends */
     chunk.id = GUINT32_FROM_LE (temp_chunk->id);
     chunk.size = GUINT32_FROM_LE (temp_chunk->size);
@@ -447,7 +457,8 @@ gst_avi_demux_metadata (GstAviDemux *avi_demux, gint len)
     if (chunk.size == 0)
       continue;
 
-    got_bytes = gst_bytestream_peek_bytes (bs, (guint8**)&name, chunk.size);
+    got_bytes = gst_bytestream_peek_bytes (bs, &tempdata, chunk.size);
+    name = (gchar *) tempdata;
     gst_bytestream_flush (bs, (chunk.size + 1) & ~1);
     if (got_bytes != chunk.size)
       return;
@@ -567,6 +578,7 @@ static void
 gst_avi_demux_strf_vids (GstAviDemux *avi_demux)
 {
   gst_riff_strf_vids *strf;
+  guint8 *strfdata;
   GstPad *srcpad;
   GstCaps *newcaps = NULL, *capslist = NULL;
   avi_stream_context *stream;
@@ -575,7 +587,8 @@ gst_avi_demux_strf_vids (GstAviDemux *avi_demux)
   gchar *codecname;
   GstPropsEntry *entry;
 
-  got_bytes = gst_bytestream_peek_bytes (bs, (guint8 **)&strf, sizeof (gst_riff_strf_vids));
+  got_bytes = gst_bytestream_peek_bytes (bs, &strfdata, sizeof (gst_riff_strf_vids));
+  strf = (gst_riff_strf_vids *) strfdata;
   if (got_bytes != sizeof (gst_riff_strf_vids))
     return;
 
@@ -745,6 +758,7 @@ static void
 gst_avi_demux_strf_auds (GstAviDemux *avi_demux)
 {
   gst_riff_strf_auds *strf;
+  guint8 *strfdata;
   GstPad *srcpad;
   GstCaps *newcaps = NULL, *capslist = NULL;
   avi_stream_context *stream;
@@ -753,7 +767,8 @@ gst_avi_demux_strf_auds (GstAviDemux *avi_demux)
   gchar *codecname;
   GstPropsEntry *entry;
 
-  got_bytes = gst_bytestream_peek_bytes (bs, (guint8 **)&strf, sizeof (gst_riff_strf_auds));
+  got_bytes = gst_bytestream_peek_bytes (bs, &strfdata, sizeof (gst_riff_strf_auds));
+  strf = (gst_riff_strf_auds *) strfdata;
   if (got_bytes != sizeof (gst_riff_strf_auds))
     return;
 
@@ -883,13 +898,15 @@ static void
 gst_avi_demux_strf_iavs (GstAviDemux *avi_demux)
 {
   gst_riff_strf_iavs *strf;
+  guint8 *strfdata;
   GstPad *srcpad;
   GstCaps *newcaps = NULL, *capslist = NULL;
   avi_stream_context *stream;
   GstByteStream  *bs = avi_demux->bs;
   guint32 got_bytes;
 
-  got_bytes = gst_bytestream_peek_bytes (bs, (guint8 **)&strf, sizeof (gst_riff_strf_iavs));
+  got_bytes = gst_bytestream_peek_bytes (bs, &strfdata, sizeof (gst_riff_strf_iavs));
+  strf = (gst_riff_strf_iavs *) strfdata;
   if (got_bytes != sizeof (gst_riff_strf_iavs))
     return;
 
@@ -1515,11 +1532,13 @@ gst_avi_demux_loop (GstElement *element)
   pos = gst_bytestream_tell (bs);
   do {
     gst_riff_riff *temp_chunk;
+    guint8 *tempdata;
     guint32 skipsize;
 
     /* read first two dwords to get chunktype and size */
     while (TRUE) {
-      got_bytes = gst_bytestream_peek_bytes (bs, (guint8 **) &temp_chunk, sizeof (gst_riff_chunk));
+      got_bytes = gst_bytestream_peek_bytes (bs, &tempdata, sizeof (gst_riff_chunk));
+      temp_chunk = (gst_riff_riff *) tempdata;
       if (got_bytes < sizeof (gst_riff_chunk)) {
         if (!gst_avi_demux_handle_sink_event (avi_demux))
           return;
@@ -1535,7 +1554,8 @@ gst_avi_demux_loop (GstElement *element)
       case GST_RIFF_TAG_LIST:
         /* read complete list chunk */
         while (TRUE) {
-          got_bytes = gst_bytestream_peek_bytes (bs, (guint8 **) &temp_chunk, sizeof (gst_riff_list));
+          got_bytes = gst_bytestream_peek_bytes (bs, &tempdata, sizeof (gst_riff_list));
+	  temp_chunk = (gst_riff_riff *) tempdata;
           if (got_bytes < sizeof (gst_riff_list)) {
             if (!gst_avi_demux_handle_sink_event (avi_demux))
               return;