Commit ca9e8d19 authored by Ronald S. Bultje's avatar Ronald S. Bultje

ext/ffmpeg/gstffmpegprotocol.c: Yet Another Logic Error.

Original commit message from CVS:
* ext/ffmpeg/gstffmpegprotocol.c: (gst_ffmpegdata_peek):
Yet Another Logic Error.
parent 1a851d7f
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):
......
......@@ -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);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment