mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 20:21:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

Revert "mpegpsdemux: Workaround new gcc 4.5 compiler warning"

Browse source 
This reverts commit a331228ecc.
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) {
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:
break;
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 */
goto done;
}
@ -2898,26 +2895,23 @@ gst_flups_demux_chain (GstPad * pad, GstBuffer * buffer)
save = FALSE;
switch (ret) {
default:
/* FIXME: gcc 4.5 warns if comparing some integer with
* an enum value! */
if ((gint) ret == GST_FLOW_NEED_MORE_DATA) {
GST_DEBUG_OBJECT (demux, "need more data");
ret = GST_FLOW_OK;
goto done;
} else if ((gint) ret == GST_FLOW_LOST_SYNC) {
if (!save || demux->sink_segment.rate >= 0.0) {
GST_DEBUG_OBJECT (demux, "flushing 3 bytes");
gst_adapter_flush (demux->adapter, 3);
ADAPTER_OFFSET_FLUSH (3);
} else {
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;
case GST_FLOW_NEED_MORE_DATA:
GST_DEBUG_OBJECT (demux, "need more data");
ret = GST_FLOW_OK;
goto done;
case GST_FLOW_LOST_SYNC:
if (!save || demux->sink_segment.rate >= 0.0) {
GST_DEBUG_OBJECT (demux, "flushing 3 bytes");
gst_adapter_flush (demux->adapter, 3);
ADAPTER_OFFSET_FLUSH (3);
} else {
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;
default:
break;
}
}