diff --git a/ChangeLog b/ChangeLog
index 705a940239..ba8041c87f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-30  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
+
+	* gst/avi/gstavidemux.c: (gst_avi_demux_handle_src_query):
+	  Compiler pains.
+
 2005-06-30  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
 
 	* configure.ac:
diff --git a/gst/avi/gstavidemux.c b/gst/avi/gstavidemux.c
index 19d5e7a87d..f996ee3725 100644
--- a/gst/avi/gstavidemux.c
+++ b/gst/avi/gstavidemux.c
@@ -387,7 +387,7 @@ gst_avi_demux_handle_src_query (GstPad * pad, GstQuery * query)
 
   switch (GST_QUERY_TYPE (query)) {
     case GST_QUERY_POSITION:{
-      gint64 len, pos;
+      gint64 len, pos = 0;
 
       len = (((gfloat) stream->strh->scale) * stream->strh->length /
           stream->strh->rate) * GST_SECOND;
@@ -418,7 +418,8 @@ gst_avi_demux_handle_src_query (GstPad * pad, GstQuery * query)
           pos = stream->current_frame * demux->avih->us_frame * GST_USECOND;
         }
       }
-      gst_query_set_position (query, GST_FORMAT_TIME, pos, len);
+      if (res)
+        gst_query_set_position (query, GST_FORMAT_TIME, pos, len);
       break;
     }
     default: