summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWim Taymans <wim.taymans@gmail.com>2007-03-09 15:04:45 +0000
committerWim Taymans <wim.taymans@gmail.com>2007-03-09 15:04:45 +0000
commita98caaeb67d1c9de9feacffe5d77813e92588606 (patch)
tree9b04873cc2bb5b0cfa9e306d5ee6598ac335b1ad
parent44e09dddc430f9e24f0db08fc86120e3cd8b13c7 (diff)
gst/avi/gstavidemux.c: Fix stream position reporting after a seek. Fixes #416445.
Original commit message from CVS: * gst/avi/gstavidemux.c: (gst_avi_demux_parse_stream), (gst_avi_demux_push_event), (gst_avi_demux_do_seek), (gst_avi_demux_process_next_entry), (gst_avi_demux_stream_data), (gst_avi_demux_chain): Fix stream position reporting after a seek. Fixes #416445.
-rw-r--r--ChangeLog8
-rw-r--r--gst/avi/gstavidemux.c2
2 files changed, 10 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 19699b8b..ce6602b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-03-09 Wim Taymans <wim@fluendo.com>
+
+ * gst/avi/gstavidemux.c: (gst_avi_demux_parse_stream),
+ (gst_avi_demux_push_event), (gst_avi_demux_do_seek),
+ (gst_avi_demux_process_next_entry), (gst_avi_demux_stream_data),
+ (gst_avi_demux_chain):
+ Fix stream position reporting after a seek. Fixes #416445.
+
2007-03-08 Wim Taymans <wim@fluendo.com>
Patch by: René Stadler <mail at renestadler dot de>
diff --git a/gst/avi/gstavidemux.c b/gst/avi/gstavidemux.c
index 0177e5a8..dfb726f1 100644
--- a/gst/avi/gstavidemux.c
+++ b/gst/avi/gstavidemux.c
@@ -3040,7 +3040,9 @@ gst_avi_demux_do_seek (GstAviDemux * avi, GstSegment * segment)
* to the time of the keyframe. */
seek_time = avi->index_entries[avi->current_entry].ts;
}
+ /* the seek time is also the last_stop and stream time */
segment->last_stop = seek_time;
+ segment->time = seek_time;
return TRUE;
}