summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Dröge <slomo@circular-chaos.org>2008-10-27 09:27:18 +0000
committerSebastian Dröge <slomo@circular-chaos.org>2008-10-27 09:27:18 +0000
commit46c603da9300a13bf07988224895ebdc04691cfc (patch)
tree17828070c9ca9b39d0754f4bb2b8836fd2536af4
parent2dadd8a0cccf3655ef327f4b897f19d75c176e17 (diff)
downloadgst-plugins-bad-46c603da9300a13bf07988224895ebdc04691cfc.tar.gz
gst-plugins-bad-46c603da9300a13bf07988224895ebdc04691cfc.tar.bz2
gst-plugins-bad-46c603da9300a13bf07988224895ebdc04691cfc.zip
gst/flv/gstflvdemux.c: Error out early if pulling a tag failed.
Original commit message from CVS: * gst/flv/gstflvdemux.c: (gst_flv_demux_pull_tag): Error out early if pulling a tag failed.
-rw-r--r--ChangeLog5
-rw-r--r--gst/flv/gstflvdemux.c3
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index d1278e8b..3d80cf14 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2008-10-27 Sebastian Dröge <sebastian.droege@collabora.co.uk>
+ * gst/flv/gstflvdemux.c: (gst_flv_demux_pull_tag):
+ Error out early if pulling a tag failed.
+
+2008-10-27 Sebastian Dröge <sebastian.droege@collabora.co.uk>
+
* gst/flv/gstflvdemux.c: (gst_flv_demux_create_index),
(gst_flv_demux_loop):
* gst/flv/gstflvparse.c: (gst_flv_parse_tag_script),
diff --git a/gst/flv/gstflvdemux.c b/gst/flv/gstflvdemux.c
index 6448d6a5..afef17bd 100644
--- a/gst/flv/gstflvdemux.c
+++ b/gst/flv/gstflvdemux.c
@@ -354,6 +354,9 @@ gst_flv_demux_pull_tag (GstPad * pad, GstFLVDemux * demux)
gst_buffer_unref (buffer);
+ if (G_UNLIKELY (ret != GST_FLOW_OK))
+ goto beach;
+
/* Jump over tag type + size */
demux->offset += FLV_TAG_TYPE_SIZE;