summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Dröge <slomo@circular-chaos.org>2008-08-02 17:59:05 +0000
committerSebastian Dröge <slomo@circular-chaos.org>2008-08-02 17:59:05 +0000
commit9cb2a4f461d280ade142de041212343b15b971ae (patch)
tree13c40e987e141d14b4864b8dfa7c66f41b64ad19
parentf5fdbfd4167f4e7d7db2e0c9f8a63648466f639b (diff)
gst/matroska/matroska-demux.c: If no Tracks are found error out instead of trying it again until the end of time.
Original commit message from CVS: * gst/matroska/matroska-demux.c: (gst_matroska_demux_loop_stream_parse_id): If no Tracks are found error out instead of trying it again until the end of time.
-rw-r--r--ChangeLog7
-rw-r--r--gst/matroska/matroska-demux.c4
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 1418f68c..4d2eae47 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2008-08-02 Sebastian Dröge <sebastian.droege@collabora.co.uk>
+ * gst/matroska/matroska-demux.c:
+ (gst_matroska_demux_loop_stream_parse_id):
+ If no Tracks are found error out instead of trying it again until the
+ end of time.
+
+2008-08-02 Sebastian Dröge <sebastian.droege@collabora.co.uk>
+
* gst/matroska/matroska-demux.c: (gst_matroska_demux_audio_caps):
Fix demuxing of raw integer audio. The samples are unsigned only for 8
bit and signed otherwise, not the other way around.
diff --git a/gst/matroska/matroska-demux.c b/gst/matroska/matroska-demux.c
index bea8c8c4..0b75ddf4 100644
--- a/gst/matroska/matroska-demux.c
+++ b/gst/matroska/matroska-demux.c
@@ -4546,7 +4546,7 @@ gst_matroska_demux_loop_stream_parse_id (GstMatroskaDemux * demux,
}
if (ret != GST_FLOW_OK)
- break;
+ return ret;
demux->state = GST_MATROSKA_DEMUX_STATE_DATA;
/* send initial discont */
@@ -4601,7 +4601,7 @@ gst_matroska_demux_loop_stream_parse_id (GstMatroskaDemux * demux,
return ret;
break;
}
- return GST_FLOW_OK;
+ return ret;
}
static GstFlowReturn