From d8ba748359ac0ddd965ca06745f67434fbc9a859 Mon Sep 17 00:00:00 2001 From: David Conrad Date: Fri, 12 Mar 2010 05:16:51 +0000 Subject: [PATCH] oggdec: Read ogm metadata Originally committed as revision 22475 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/oggparseogm.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libavformat/oggparseogm.c b/libavformat/oggparseogm.c index beeb27d5bc..e7c18536f4 100644 --- a/libavformat/oggparseogm.c +++ b/libavformat/oggparseogm.c @@ -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; }