resindvdbin: Apply gcc 4.5 compiler warning workaround to the mpegpsdemux copy

Same as a331228ecc.
This commit is contained in:
Sebastian Dröge 2010-04-15 21:40:19 +02:00
parent aabe73387a
commit 65b0f75d1b

View file

@ -1933,17 +1933,20 @@ 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;
} }
@ -1985,23 +1988,26 @@ gst_flups_demux_chain (GstPad * pad, GstBuffer * buffer)
save = FALSE; save = FALSE;
switch (ret) { switch (ret) {
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: 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;
}
break; break;
} }
} }