diff options
author | Sebastian Dröge <slomo@circular-chaos.org> | 2008-10-12 17:08:10 +0000 |
---|---|---|
committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2009-05-12 21:20:56 +0200 |
commit | 9611ec851d1840bbaffbb3b4ced7bb86cb6e912d (patch) | |
tree | 787e97c185653507f054a3fb8430763bdb358d0b /gst/flv | |
parent | 9a8884f7cae311b0b1c3984072df2fb417dbe3c8 (diff) |
[MOVED FROM BAD 30/57] 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.
Diffstat (limited to 'gst/flv')
-rw-r--r-- | gst/flv/gstflvdemux.c | 12 |
1 files changed, 6 insertions, 6 deletions
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), |