[FFmpeg-cvslog] r22475 - trunk/libavformat/oggparseogm.c

[conrad]

Author: conrad
Date: Fri Mar 12 06:16:51 2010
New Revision: 22475

Log:
oggdec: Read ogm metadata

Modified:
   trunk/libavformat/oggparseogm.c

Modified: trunk/libavformat/oggparseogm.c
==============================================================================
--- trunk/libavformat/oggparseogm.c	Fri Mar 12 06:16:47 2010	(r22474)
+++ trunk/libavformat/oggparseogm.c	Fri Mar 12 06:16:51 2010	(r22475)
@@ -43,8 +43,7 @@ ogm_header(AVFormatContext *s, int idx)
 
     if(!(*p & 1))
         return 0;
-    if(*p != 1)
-        return 1;
+    if(*p == 1) {
 
     p++;
 
@@ -93,6 +92,10 @@ ogm_header(AVFormatContext *s, int idx)
         st->time_base.num = 1;
         st->time_base.den = st->codec->sample_rate;
     }
+    } else if (*p == 3) {
+        if (os->psize > 8)
+            ff_vorbis_comment(s, &st->metadata, p+7, os->psize-8);
+    }
 
     return 1;
 }