diff options
| author | Edward Hervey <bilboed@bilboed.com> | 2006-08-30 11:27:40 +0000 |
|---|---|---|
| committer | Edward Hervey <bilboed@bilboed.com> | 2006-08-30 11:27:40 +0000 |
| commit | 292c339a4c32269fe4200e1987e4d1f3e0be613a (patch) | |
| tree | e53216bf1d3db4011567826fc344f70e3a6fd5f5 | |
| parent | 278c9c66393f9f3d565c0a9f2a60c129d404a0c6 (diff) | |
| download | gst-plugins-bad-292c339a4c32269fe4200e1987e4d1f3e0be613a.tar.gz gst-plugins-bad-292c339a4c32269fe4200e1987e4d1f3e0be613a.tar.bz2 gst-plugins-bad-292c339a4c32269fe4200e1987e4d1f3e0be613a.zip | |
gst/qtdemux/qtdemux.c: Reset each streams last_flow to GST_FLOW_OK.
Original commit message from CVS:
* gst/qtdemux/qtdemux.c:
(gst_qtdemux_do_seek):
Reset each streams last_flow to GST_FLOW_OK.
(gst_qtdemux_activate_segment):
Removing mystic modifications for good.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | gst/qtdemux/qtdemux.c | 6 |
2 files changed, 13 insertions, 1 deletions
@@ -1,3 +1,11 @@ +2006-08-30 Edward Hervey <edward@fluendo.com> + + * gst/qtdemux/qtdemux.c: + (gst_qtdemux_do_seek): + Reset each streams last_flow to GST_FLOW_OK. + (gst_qtdemux_activate_segment): + Removing mystic modifications for good. + 2006-08-30 Stefan Kost <ensonic@users.sf.net> * gst/qtdemux/qtdemux.c: (gst_qtdemux_activate_segment), diff --git a/gst/qtdemux/qtdemux.c b/gst/qtdemux/qtdemux.c index de5f842c..2b0e7536 100644 --- a/gst/qtdemux/qtdemux.c +++ b/gst/qtdemux/qtdemux.c @@ -753,6 +753,7 @@ gst_qtdemux_do_seek (GstQTDemux * qtdemux, GstPad * pad, GstEvent * event) gboolean res; gboolean update; GstSegment seeksegment; + int i; if (event) { GST_DEBUG_OBJECT (qtdemux, "doing seek with event"); @@ -843,6 +844,9 @@ gst_qtdemux_do_seek (GstQTDemux * qtdemux, GstPad * pad, GstEvent * event) /* restart streaming, NEWSEGMENT will be sent from the streaming * thread. */ qtdemux->segment_running = TRUE; + for (i = 0; i < qtdemux->n_streams; i++) { + qtdemux->streams[i]->last_ret = GST_FLOW_OK; + } gst_pad_start_task (qtdemux->sinkpad, (GstTaskFunction) gst_qtdemux_loop, qtdemux->sinkpad); @@ -1088,7 +1092,7 @@ gst_qtdemux_activate_segment (GstQTDemux * qtdemux, QtDemuxStream * stream, stop = segment->media_stop; else stop = MIN (segment->media_stop, qtdemux->segment.stop); - start = segment->media_start + seg_time; + start = MIN (segment->media_start + seg_time, stop); GST_DEBUG_OBJECT (qtdemux, "newsegment %d from %" GST_TIME_FORMAT " to %" GST_TIME_FORMAT ", time %" GST_TIME_FORMAT, seg_idx, |