summaryrefslogtreecommitdiffstats
path: root/gst/id3demux
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim@centricular.net>2006-07-03 16:43:10 +0000
committerTim-Philipp Müller <tim@centricular.net>2006-07-03 16:43:10 +0000
commit52f6cd9c1fce569372b5214f03782c56690b0864 (patch)
tree5a665bac3017b12df2b847d750c0059a1bb96668 /gst/id3demux
parent00e08a3f6eb6f504d9a42b7ee689d7c646de464a (diff)
gst/: Return FLOW_UNEXPECTED when at the end of the file, not
Original commit message from CVS: * gst/apetag/gsttagdemux.c: (gst_tag_demux_chain): * gst/id3demux/gstid3demux.c: (gst_id3demux_chain): Return FLOW_UNEXPECTED when at the end of the file, not FLOW_ERROR. Fixes 'internal stream error' errors that would sometimes occur in totem when scrubbing to the end of an ID3v1 tagged mp3 file.
Diffstat (limited to 'gst/id3demux')
-rw-r--r--gst/id3demux/gstid3demux.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/gst/id3demux/gstid3demux.c b/gst/id3demux/gstid3demux.c
index d2f21573..b498639f 100644
--- a/gst/id3demux/gstid3demux.c
+++ b/gst/id3demux/gstid3demux.c
@@ -444,7 +444,7 @@ gst_id3demux_chain (GstPad * pad, GstBuffer * buf)
typefind_buf = id3demux->collect;
gst_buffer_ref (typefind_buf);
if (!gst_id3demux_trim_buffer (id3demux, &typefind_buf))
- return GST_FLOW_ERROR;
+ return GST_FLOW_UNEXPECTED;
if (typefind_buf == NULL)
break; /* Still need more data */
@@ -507,7 +507,7 @@ gst_id3demux_chain (GstPad * pad, GstBuffer * buf)
outbuf = id3demux->collect;
id3demux->collect = NULL;
if (!gst_id3demux_trim_buffer (id3demux, &outbuf))
- return GST_FLOW_ERROR;
+ return GST_FLOW_UNEXPECTED;
}
if (outbuf) {
if (G_UNLIKELY (id3demux->srcpad == NULL)) {