summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWim Taymans <wim.taymans@gmail.com>2008-10-08 14:47:14 +0000
committerWim Taymans <wim.taymans@gmail.com>2008-10-08 14:47:14 +0000
commit52e9c2a32bf5dfcafff298142182b98597b7fcb6 (patch)
treee83486ea62f8853ccba3d663fb4aeb8553d3f52e
parentb9a1894e5c5b2f07cdb20c7465d6915aaedec438 (diff)
gst/avi/gstavidemux.c: Reset header state. Fixes #555321.
Original commit message from CVS: * gst/avi/gstavidemux.c: (gst_avi_demux_reset), (gst_avi_demux_parse_subindex), (gst_avi_demux_parse_index): Reset header state. Fixes #555321.
-rw-r--r--ChangeLog6
-rw-r--r--gst/avi/gstavidemux.c1
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 22e48517..eeb82a62 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2008-10-08 Wim Taymans <wim.taymans@collabora.co.uk>
+ * gst/avi/gstavidemux.c: (gst_avi_demux_reset),
+ (gst_avi_demux_parse_subindex), (gst_avi_demux_parse_index):
+ Reset header state. Fixes #555321.
+
+2008-10-08 Wim Taymans <wim.taymans@collabora.co.uk>
+
* gst/avi/gstavidemux.c: (gst_avi_demux_parse_subindex),
(gst_avi_demux_parse_stream), (gst_avi_demux_parse_index):
* gst/avi/gstavidemux.h:
diff --git a/gst/avi/gstavidemux.c b/gst/avi/gstavidemux.c
index a0b47412..255f5353 100644
--- a/gst/avi/gstavidemux.c
+++ b/gst/avi/gstavidemux.c
@@ -239,6 +239,7 @@ gst_avi_demux_reset (GstAviDemux * avi)
}
memset (&avi->stream, 0, sizeof (avi->stream));
+ avi->header_state = GST_AVI_DEMUX_HEADER_TAG_LIST;
avi->num_streams = 0;
avi->num_v_streams = 0;
avi->num_a_streams = 0;