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

22
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_OK: case GST_FLOW_NEED_MORE_DATA:
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 */ /* Go and get more data */
ret = GST_FLOW_OK; ret = GST_FLOW_OK;
goto done; goto done;
} else if ((gint) ret == GST_FLOW_LOST_SYNC) { case GST_FLOW_LOST_SYNC:
/* for FLOW_OK or lost-sync, carry onto resync */ /* for FLOW_OK or lost-sync, carry onto resync */
ret = GST_FLOW_OK; ret = GST_FLOW_OK;
break; break;
} case GST_FLOW_OK:
break;
default:
/* Any other return value should be sent upstream immediately */ /* Any other return value should be sent upstream immediately */
goto done; goto done;
} }
@ -2898,14 +2895,11 @@ 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
* an enum value! */
if ((gint) ret == GST_FLOW_NEED_MORE_DATA) {
GST_DEBUG_OBJECT (demux, "need more data"); GST_DEBUG_OBJECT (demux, "need more data");
ret = GST_FLOW_OK; ret = GST_FLOW_OK;
goto done; goto done;
} else if ((gint) ret == GST_FLOW_LOST_SYNC) { case GST_FLOW_LOST_SYNC:
if (!save || demux->sink_segment.rate >= 0.0) { if (!save || demux->sink_segment.rate >= 0.0) {
GST_DEBUG_OBJECT (demux, "flushing 3 bytes"); GST_DEBUG_OBJECT (demux, "flushing 3 bytes");
gst_adapter_flush (demux->adapter, 3); gst_adapter_flush (demux->adapter, 3);
@ -2917,7 +2911,7 @@ gst_flups_demux_chain (GstPad * pad, GstBuffer * buffer)
} }
ret = GST_FLOW_OK; ret = GST_FLOW_OK;
break; break;
} default:
break; break;
} }
} }