diff options
| author | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2004-01-23 13:22:16 +0000 |
|---|---|---|
| committer | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2004-01-23 13:22:16 +0000 |
| commit | 37ac1f6617b8f6f2299ca25b33e1a315e21e902d (patch) | |
| tree | 49f89b5051e91944486924c7ca9f97f373e57356 /gst/avi/gstavidemux.c | |
| parent | 919e61aa5cdc10cec791b42459bba9079433e001 (diff) | |
ext/ogg/gstoggdemux.c: Fix wrong file comment.
Original commit message from CVS:
2004-01-23 Ronald Bultje <rbultje@ronald.bitfreak.net>
* ext/ogg/gstoggdemux.c:
Fix wrong file comment.
* gst-libs/gst/riff/riff-read.c: (gst_riff_read_info):
* gst/avi/gstavidemux.c: (gst_avi_demux_stream_header):
Add metadata reading properly.
Diffstat (limited to 'gst/avi/gstavidemux.c')
| -rw-r--r-- | gst/avi/gstavidemux.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/gst/avi/gstavidemux.c b/gst/avi/gstavidemux.c index 882e0d70..8b52fe76 100644 --- a/gst/avi/gstavidemux.c +++ b/gst/avi/gstavidemux.c @@ -1215,12 +1215,6 @@ gst_avi_demux_stream_header (GstAviDemux *avi) return FALSE; break; - case GST_RIFF_LIST_INFO: - if (!gst_riff_read_list (riff, &tag) || - !gst_riff_read_info (riff)) - return FALSE; - break; - default: GST_WARNING ("Unknown list " GST_FOURCC_FORMAT " in AVI header", GST_FOURCC_ARGS (tag)); @@ -1271,8 +1265,13 @@ gst_avi_demux_stream_header (GstAviDemux *avi) if (!(tag = gst_riff_peek_list (riff))) return FALSE; if (tag != GST_RIFF_LIST_movi) { - if (!gst_riff_read_skip (riff)) + if (tag == GST_RIFF_LIST_INFO) { + if (!gst_riff_read_list (riff, &tag) || + !gst_riff_read_info (riff)) + return FALSE; + } else if (!gst_riff_read_skip (riff)) { return FALSE; + } continue; } break; |