From 37ac1f6617b8f6f2299ca25b33e1a315e21e902d Mon Sep 17 00:00:00 2001
From: "Ronald S. Bultje" <rbultje@ronald.bitfreak.net>
Date: Fri, 23 Jan 2004 13:22:16 +0000
Subject: [PATCH] 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.
---
 ChangeLog             |  8 ++++++++
 gst/avi/gstavidemux.c | 13 ++++++-------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1039ab864f..c2c446ca41 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+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.
+
 2004-01-23  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* ext/Makefile.am:
diff --git a/gst/avi/gstavidemux.c b/gst/avi/gstavidemux.c
index 882e0d7002..8b52fe7667 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;