From ca9e8d1988d37ac98e3e9d0f21a0052e02b1b015 Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Tue, 25 Jan 2005 17:10:04 +0000 Subject: [PATCH] ext/ffmpeg/gstffmpegprotocol.c: Yet Another Logic Error. Original commit message from CVS: * ext/ffmpeg/gstffmpegprotocol.c: (gst_ffmpegdata_peek): Yet Another Logic Error. --- ChangeLog | 5 +++++ ext/ffmpeg/gstffmpegprotocol.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 03b80046..1b0c4066 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-01-25 Ronald S. Bultje + + * ext/ffmpeg/gstffmpegprotocol.c: (gst_ffmpegdata_peek): + Yet Another Logic Error. + 2005-01-25 Ronald S. Bultje * ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_negotiate): diff --git a/ext/ffmpeg/gstffmpegprotocol.c b/ext/ffmpeg/gstffmpegprotocol.c index db2032ee..69a6aea6 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); -- 2.34.1