summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRonald S. Bultje <rbultje@ronald.bitfreak.net>2005-02-08 18:51:25 +0000
committerRonald S. Bultje <rbultje@ronald.bitfreak.net>2005-02-08 18:51:25 +0000
commite597352d19cb38b839ef6a2c17a827dbd3c5d865 (patch)
treeca64060577f55af6ad4f368bffbff832cded7680
parentebb9face416757a5e93fd2bfbb14afc712b1802c (diff)
downloadgst-plugins-bad-e597352d19cb38b839ef6a2c17a827dbd3c5d865.tar.gz
gst-plugins-bad-e597352d19cb38b839ef6a2c17a827dbd3c5d865.tar.bz2
gst-plugins-bad-e597352d19cb38b839ef6a2c17a827dbd3c5d865.zip
ext/mplex/gstmplexibitstream.cc: Fix event handling (#165525).
Original commit message from CVS: * ext/mplex/gstmplexibitstream.cc: Fix event handling (#165525).
-rw-r--r--ChangeLog5
-rw-r--r--ext/mplex/gstmplexibitstream.cc4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index cbc3f59a..ca2b0656 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2005-02-08 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
+ * ext/mplex/gstmplexibitstream.cc:
+ Fix event handling (#165525).
+
+2005-02-08 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
+
* ext/mikmod/gstmikmod.c:
* gst/modplug/gstmodplug.cc:
Add missing endianness to template (fixes #165509).
diff --git a/ext/mplex/gstmplexibitstream.cc b/ext/mplex/gstmplexibitstream.cc
index d749fe2a..28c0ff0b 100644
--- a/ext/mplex/gstmplexibitstream.cc
+++ b/ext/mplex/gstmplexibitstream.cc
@@ -70,17 +70,15 @@ size_t GstMplexIBitStream::ReadStreamBytes (uint8_t * buf, size_t size)
{
guint8 *
data;
-
guint
read;
if (eos)
return 0;
- if ((read = gst_bytestream_peek_bytes (bs, &data, size)) != size) {
+ while (!eos && (read = gst_bytestream_peek_bytes (bs, &data, size)) != size) {
GstEvent *
event;
-
guint
pending;