gst/avi/gstavidemux.c: Fix AVI header parsing: add missing break statement after

Original commit message from CVS:
* gst/avi/gstavidemux.c: (gst_avi_demux_stream_header):
Fix AVI header parsing: add missing break statement after
GST_RIFF_INFO_LIST parsing code; gst_riff_read_chunk() has
already advanced the avi->offset, no need to do it twice
(fixes MovieOfMovies.avi).
This commit is contained in:
Tim-Philipp Müller 2005-08-09 14:40:02 +00:00
parent 471fec5c95
commit f6d8dee68d
2 changed files with 12 additions and 0 deletions

View file

@ -1,3 +1,11 @@
2005-08-09 Tim-Philipp Müller <tim at centricular dot net>
* gst/avi/gstavidemux.c: (gst_avi_demux_stream_header):
Fix AVI header parsing: add missing break statement after
GST_RIFF_INFO_LIST parsing code; gst_riff_read_chunk() has
already advanced the avi->offset, no need to do it twice
(fixes MovieOfMovies.avi).
2005-08-09 Tim-Philipp Müller <tim at centricular dot net> 2005-08-09 Tim-Philipp Müller <tim at centricular dot net>
* ext/jpeg/gstjpegdec.c: (gst_jpeg_dec_init), * ext/jpeg/gstjpegdec.c: (gst_jpeg_dec_init),

View file

@ -1848,6 +1848,8 @@ gst_avi_demux_stream_header (GstAviDemux * avi)
avi->avih->streams, avi->num_streams); avi->avih->streams, avi->num_streams);
} }
GST_DEBUG_OBJECT (avi, "skipping junk between header and data ...");
/* Now, find the data (i.e. skip all junk between header and data) */ /* Now, find the data (i.e. skip all junk between header and data) */
do { do {
guint size; guint size;
@ -1881,6 +1883,8 @@ gst_avi_demux_stream_header (GstAviDemux * avi)
gst_tag_list_free (t); gst_tag_list_free (t);
gst_buffer_unref (buf); gst_buffer_unref (buf);
} }
/* gst_riff_read_chunk() has already advanced avi->offset */
break;
default: default:
avi->offset += 8 + ((size + 1) & ~1); avi->offset += 8 + ((size + 1) & ~1);
break; break;