summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Dröge <slomo@circular-chaos.org>2008-06-16 09:54:27 +0000
committerSebastian Dröge <slomo@circular-chaos.org>2008-06-16 09:54:27 +0000
commit5e606453c015993d4367003a077ae627d3b9eb65 (patch)
tree39538329f01cf9f116f2b81aa5f2c3cc2cf3c066
parent94f778f952529d74f2f7e5f425fa610dd7432792 (diff)
gst/matroska/ebml-read.c: Return GST_FLOW_UNEXPECTED instead of GST_FLOW_ERROR on short reads.
Original commit message from CVS: * gst/matroska/ebml-read.c: (gst_ebml_read_peek_bytes): Return GST_FLOW_UNEXPECTED instead of GST_FLOW_ERROR on short reads. If we get less bytes than requested we can't do anything except doing our EOS logic.
-rw-r--r--ChangeLog7
-rw-r--r--gst/matroska/ebml-read.c2
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 1c964f5b..99a90b08 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-06-16 Sebastian Dröge <slomo@circular-chaos.org>
+
+ * gst/matroska/ebml-read.c: (gst_ebml_read_peek_bytes):
+ Return GST_FLOW_UNEXPECTED instead of GST_FLOW_ERROR on short reads.
+ If we get less bytes than requested we can't do anything except doing
+ our EOS logic.
+
2008-06-15 Sebastian Dröge <slomo@circular-chaos.org>
* gst/matroska/matroska-demux.c: (gst_matroska_demux_reset),
diff --git a/gst/matroska/ebml-read.c b/gst/matroska/ebml-read.c
index fc0427e9..82d8217a 100644
--- a/gst/matroska/ebml-read.c
+++ b/gst/matroska/ebml-read.c
@@ -266,7 +266,7 @@ gst_ebml_read_peek_bytes (GstEbmlRead * ebml, guint size, GstBuffer ** p_buf,
*p_buf = NULL;
if (bytes)
*bytes = NULL;
- return GST_FLOW_ERROR;
+ return GST_FLOW_UNEXPECTED;
}
if (p_buf)