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

mpegstream: Remove dead assignments.

Browse source 
The duplicate assignment of update_time was weird... but it seems normal
that it's indeed the second statement which is the valid one.
This commit is contained in:
Edward Hervey 2009-04-21 20:20:02 +02:00
parent d8ef47b5ea
commit df349f9359
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
gst/mpegstream/gstmpegdemux.c
View file

@ -504,11 +504,9 @@ static gboolean
gst_mpeg_demux_parse_packhead (GstMPEGParse * mpeg_parse, GstBuffer * buffer) gst_mpeg_demux_parse_packhead (GstMPEGParse * mpeg_parse, GstBuffer * buffer)
{ {
GstMPEGDemux *demux = GST_MPEG_DEMUX (mpeg_parse); GstMPEGDemux *demux = GST_MPEG_DEMUX (mpeg_parse);
guint8 *buf;
parent_class->parse_packhead (mpeg_parse, buffer); parent_class->parse_packhead (mpeg_parse, buffer);
buf = GST_BUFFER_DATA (buffer);
/* do something useful here */ /* do something useful here */
if (demux->pending_tags) { if (demux->pending_tags) {
@ -653,12 +651,12 @@ gst_mpeg_demux_parse_packet (GstMPEGParse * mpeg_parse, GstBuffer * buffer)
guint16 datalen; guint16 datalen;
GstMPEGStream *outstream = NULL; GstMPEGStream *outstream = NULL;
guint8 *buf, *basebuf; guint8 *buf;
gint64 timestamp; gint64 timestamp;
GstFlowReturn ret = GST_FLOW_OK; GstFlowReturn ret = GST_FLOW_OK;
basebuf = buf = GST_BUFFER_DATA (buffer); buf = GST_BUFFER_DATA (buffer);
id = *(buf + 3); id = *(buf + 3);
buf += 4; buf += 4;
@ -1072,7 +1070,6 @@ gst_mpeg_demux_send_subbuffer (GstMPEGDemux * mpeg_demux,
GstClockTimeDiff diff; GstClockTimeDiff diff;
guint64 update_time; guint64 update_time;
update_time = MIN (timestamp, mpeg_parse->current_segment.stop);
update_time = MAX (timestamp, mpeg_parse->current_segment.start); update_time = MAX (timestamp, mpeg_parse->current_segment.start);
diff = GST_CLOCK_DIFF (mpeg_parse->current_segment.last_stop, update_time); diff = GST_CLOCK_DIFF (mpeg_parse->current_segment.last_stop, update_time);
if (diff > GST_SECOND * 2) { if (diff > GST_SECOND * 2) {

1
gst/mpegstream/gstmpegparse.c
View file

@ -1030,7 +1030,6 @@ gst_mpeg_parse_handle_src_query (GstPad * pad, GstQuery * query)
src_format = GST_FORMAT_TIME; src_format = GST_FORMAT_TIME;
if (gst_pad_query_peer_duration (mpeg_parse->sinkpad, if (gst_pad_query_peer_duration (mpeg_parse->sinkpad,
&src_format, &src_value)) { &src_format, &src_value)) {
res = TRUE;
break; break;
} }
/* Otherwise fallthrough */ /* Otherwise fallthrough */