diff --git a/ChangeLog b/ChangeLog
index 03b8004685..1b0c4066c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-25  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
+
+	* ext/ffmpeg/gstffmpegprotocol.c: (gst_ffmpegdata_peek):
+	  Yet Another Logic Error.
+
 2005-01-25  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
 
 	* ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_negotiate):
diff --git a/ext/ffmpeg/gstffmpegprotocol.c b/ext/ffmpeg/gstffmpegprotocol.c
index db2032eed8..69a6aea6e7 100644
--- a/ext/ffmpeg/gstffmpegprotocol.c
+++ b/ext/ffmpeg/gstffmpegprotocol.c
@@ -102,7 +102,7 @@ gst_ffmpegdata_peek (URLContext * h, unsigned char *buf, int size)
 
   info = (GstProtocolInfo *) h->priv_data;
 
-  g_return_val_if_fail (info->flags == URL_RDONLY, -EIO);
+  g_return_val_if_fail (info->flags == URL_RDONLY, AVERROR_IO);
 
   bs = info->bs;
 
@@ -164,7 +164,7 @@ gst_ffmpegdata_peek (URLContext * h, unsigned char *buf, int size)
       if (will_get_eos)
         info->eos = TRUE;
     }
-  } while ((!info->eos && total != request) || have_event);
+  } while ((!info->eos && total != request) && !have_event);
 
   memcpy (buf, data, total);