summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRonald S. Bultje <rbultje@ronald.bitfreak.net>2004-10-04 17:29:27 +0000
committerRonald S. Bultje <rbultje@ronald.bitfreak.net>2004-10-04 17:29:27 +0000
commit9712010d44b32aa839d6f19ae2d8ae57507064a6 (patch)
treec6752cfcc79d25295aed44097e41ef7f6ceb8e5b
parentb90716dd184e3a270fc31ab39307548fe16337cc (diff)
gst/avi/gstavidemux.c: There was something wrong with the index massaging.
Original commit message from CVS: * gst/avi/gstavidemux.c: (gst_avi_demux_massage_index): There was something wrong with the index massaging.
-rw-r--r--ChangeLog5
-rw-r--r--gst/avi/gstavidemux.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 0deee78c..62fcd15b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-04 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
+
+ * gst/avi/gstavidemux.c: (gst_avi_demux_massage_index):
+ There was something wrong with the index massaging.
+
2004-10-04 Wim Taymans <wim@fluendo.com>
* ext/jpeg/gstjpeg.c: (smoke_type_find), (plugin_init):
diff --git a/gst/avi/gstavidemux.c b/gst/avi/gstavidemux.c
index 5daeb04c..84e5bace 100644
--- a/gst/avi/gstavidemux.c
+++ b/gst/avi/gstavidemux.c
@@ -1419,7 +1419,7 @@ gst_avi_demux_massage_index (GstAviDemux * avi,
entry2 = entry;
else {
entry2 = &entries[i - 1];
- list = g_list_insert_before (list, one, entry2);
+ list = g_list_insert_before (list, one->next, entry2);
entry = one->data;
one = one->next;
}
@@ -1455,7 +1455,7 @@ gst_avi_demux_massage_index (GstAviDemux * avi,
for (i = 0, one = list; one != NULL; one = one->next, i++) {
entry = one->data;
memcpy (&avi->index_entries[i], entry, sizeof (gst_avi_index_entry));
- /*g_assert (i == entry->index_nr); */
+ avi->index_entries[i].index_nr = i;
}
GST_LOG ("Freeing original index list");