mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-18 05:16:05 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst-libs/gst/riff/riff-media.c: Add MS video v1.

Browse source 
Original commit message from CVS:
* gst-libs/gst/riff/riff-media.c: (gst_riff_create_video_caps),
(gst_riff_create_video_template_caps):
Add MS video v1.
* gst/avi/gstavidemux.c: (gst_avi_demux_stream_index),
(gst_avi_demux_stream_data):
Add support for "rec-list" chunks.
This commit is contained in:
Ronald S. Bultje 2004-04-11 21:36:45 +00:00
parent 1c47f1b8ae
commit 0b122a2891
2 changed files with 26 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2004-04-11 Ronald Bultje <rbultje@ronald.bitfreak.net>
* gst-libs/gst/riff/riff-media.c: (gst_riff_create_video_caps),
(gst_riff_create_video_template_caps):
Add MS video v1.
* gst/avi/gstavidemux.c: (gst_avi_demux_stream_index),
(gst_avi_demux_stream_data):
Add support for "rec-list" chunks.
2004-04-11 Ronald Bultje <rbultje@ronald.bitfreak.net> 2004-04-11 Ronald Bultje <rbultje@ronald.bitfreak.net>
* gst-libs/gst/riff/riff-media.c: (gst_riff_create_audio_caps): * gst-libs/gst/riff/riff-media.c: (gst_riff_create_audio_caps):

17
gst/avi/gstavidemux.c
View file

@ -1065,6 +1065,9 @@ gst_avi_demux_stream_index (GstAviDemux * avi)
entry.size = GUINT32_FROM_LE (_entry->size); entry.size = GUINT32_FROM_LE (_entry->size);
target = &avi->index_entries[i]; target = &avi->index_entries[i];
if (entry.id == GST_RIFF_rec)
continue;
stream_nr = CHUNKID_TO_STREAMNR (entry.id); stream_nr = CHUNKID_TO_STREAMNR (entry.id);
if (stream_nr >= avi->num_streams || stream_nr < 0) { if (stream_nr >= avi->num_streams || stream_nr < 0) {
g_warning ("Index entry %d has invalid stream nr %d", i, stream_nr); g_warning ("Index entry %d has invalid stream nr %d", i, stream_nr);
@ -1388,6 +1391,20 @@ gst_avi_demux_stream_data (GstAviDemux * avi)
/* And then, we get the data */ /* And then, we get the data */
if (!(tag = gst_riff_peek_tag (riff, NULL))) if (!(tag = gst_riff_peek_tag (riff, NULL)))
return FALSE; return FALSE;
/* Support for rec-list files */
if (tag == GST_RIFF_TAG_LIST) {
if (!(tag = gst_riff_peek_list (riff)))
return FALSE;
if (tag == GST_RIFF_rec) {
/* Simply skip the list */
if (!gst_riff_read_list (riff, &tag))
return FALSE;
if (!(tag = gst_riff_peek_tag (riff, NULL)))
return FALSE;
}
}
stream_nr = CHUNKID_TO_STREAMNR (tag); stream_nr = CHUNKID_TO_STREAMNR (tag);
if (stream_nr < 0 || stream_nr >= avi->num_streams) { if (stream_nr < 0 || stream_nr >= avi->num_streams) {
/* recoverable */ /* recoverable */