FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Revert "mpegpsdemux: Workaround new gcc 4.5 compiler warning"

Browse Source 
This reverts commit a331228eccfb8c66493fa3c8c49338c79cf4642c.
This commit is contained in:
Sebastian Dröge 2010-04-16 19:42:00 +02:00
parent cd890c6846
commit 2908515bd4
1 changed files with 24 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
gst/mpegdemux/gstmpegdemux.c
View File

@ -2839,20 +2839,17 @@ gst_flups_demux_chain (GstPad * pad, GstBuffer * buffer)
} }
switch (ret) { switch (ret) {
case GST_FLOW_NEED_MORE_DATA:
/* Go and get more data */
ret = GST_FLOW_OK;
goto done;
case GST_FLOW_LOST_SYNC:
/* for FLOW_OK or lost-sync, carry onto resync */
ret = GST_FLOW_OK;
break;
case GST_FLOW_OK: case GST_FLOW_OK:
break; break;
default: default:
/* FIXME: gcc 4.5 warns if comparing some integer with
* an enum value! */
if ((gint) ret == GST_FLOW_NEED_MORE_DATA) {
/* Go and get more data */
ret = GST_FLOW_OK;
goto done;
} else if ((gint) ret == GST_FLOW_LOST_SYNC) {
/* for FLOW_OK or lost-sync, carry onto resync */
ret = GST_FLOW_OK;
break;
}
/* Any other return value should be sent upstream immediately */ /* Any other return value should be sent upstream immediately */
goto done; goto done;
} }
@ -2898,26 +2895,23 @@ gst_flups_demux_chain (GstPad * pad, GstBuffer * buffer)
save = FALSE; save = FALSE;
switch (ret) { switch (ret) {
default: case GST_FLOW_NEED_MORE_DATA:
/* FIXME: gcc 4.5 warns if comparing some integer with GST_DEBUG_OBJECT (demux, "need more data");
* an enum value! */ ret = GST_FLOW_OK;
if ((gint) ret == GST_FLOW_NEED_MORE_DATA) { goto done;
GST_DEBUG_OBJECT (demux, "need more data"); case GST_FLOW_LOST_SYNC:
ret = GST_FLOW_OK; if (!save || demux->sink_segment.rate >= 0.0) {
goto done; GST_DEBUG_OBJECT (demux, "flushing 3 bytes");
} else if ((gint) ret == GST_FLOW_LOST_SYNC) { gst_adapter_flush (demux->adapter, 3);
if (!save || demux->sink_segment.rate >= 0.0) { ADAPTER_OFFSET_FLUSH (3);
GST_DEBUG_OBJECT (demux, "flushing 3 bytes"); } else {
gst_adapter_flush (demux->adapter, 3); GST_DEBUG_OBJECT (demux, "saving 3 bytes");
ADAPTER_OFFSET_FLUSH (3); gst_adapter_push (demux->rev_adapter,
} else { gst_adapter_take_buffer (demux->adapter, 3));
GST_DEBUG_OBJECT (demux, "saving 3 bytes");
gst_adapter_push (demux->rev_adapter,
gst_adapter_take_buffer (demux->adapter, 3));
}
ret = GST_FLOW_OK;
break;
} }
ret = GST_FLOW_OK;
break;
default:
break; break;
} }
} }