From e67beb0857e40a52f87fc80ef1ee6d5b144699de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Sun, 12 Oct 2008 17:08:10 +0000 Subject: gst/flv/gstflvdemux.c: Fix regression of handling flow returns in pull mode. Original commit message from CVS: * gst/flv/gstflvdemux.c: (gst_flv_demux_pull_tag), (gst_flv_demux_pull_header): Fix regression of handling flow returns in pull mode. Fixes bug #556003. --- ChangeLog | 7 +++++++ gst/flv/gstflvdemux.c | 12 ++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index b1393c00..52ac98de 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-10-12 Sebastian Dröge + + * gst/flv/gstflvdemux.c: (gst_flv_demux_pull_tag), + (gst_flv_demux_pull_header): + Fix regression of handling flow returns in pull mode. + Fixes bug #556003. + 2008-10-12 Sebastian Dröge * ext/Makefile.am: diff --git a/gst/flv/gstflvdemux.c b/gst/flv/gstflvdemux.c index 8cc74f1d..df018587 100644 --- a/gst/flv/gstflvdemux.c +++ b/gst/flv/gstflvdemux.c @@ -336,8 +336,8 @@ gst_flv_demux_pull_tag (GstPad * pad, GstFLVDemux * demux) demux->cur_tag_offset = demux->offset; /* Get the first 4 bytes to identify tag type and size */ - if (G_UNLIKELY (gst_flv_demux_pull_range (demux, pad, demux->offset, - FLV_TAG_TYPE_SIZE, &buffer) != GST_FLOW_OK)) + if (G_UNLIKELY ((ret = gst_flv_demux_pull_range (demux, pad, demux->offset, + FLV_TAG_TYPE_SIZE, &buffer)) != GST_FLOW_OK)) goto beach; /* Identify tag type */ @@ -350,8 +350,8 @@ gst_flv_demux_pull_tag (GstPad * pad, GstFLVDemux * demux) demux->offset += FLV_TAG_TYPE_SIZE; /* Pull the whole tag */ - if (G_UNLIKELY (gst_flv_demux_pull_range (demux, pad, demux->offset, - demux->tag_size, &buffer) != GST_FLOW_OK)) + if (G_UNLIKELY ((ret = gst_flv_demux_pull_range (demux, pad, demux->offset, + demux->tag_size, &buffer)) != GST_FLOW_OK)) goto beach; switch (demux->state) { @@ -403,8 +403,8 @@ gst_flv_demux_pull_header (GstPad * pad, GstFLVDemux * demux) GstFlowReturn ret = GST_FLOW_OK; /* Get the first 9 bytes */ - if (G_UNLIKELY (gst_flv_demux_pull_range (demux, pad, demux->offset, - FLV_HEADER_SIZE, &buffer) != GST_FLOW_OK)) + if (G_UNLIKELY ((ret = gst_flv_demux_pull_range (demux, pad, demux->offset, + FLV_HEADER_SIZE, &buffer)) != GST_FLOW_OK)) goto beach; ret = gst_flv_parse_header (demux, GST_BUFFER_DATA (buffer), -- cgit v1.2.1