Commit d8ba7483 authored by David Conrad's avatar David Conrad

oggdec: Read ogm metadata

Originally committed as revision 22475 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 533c30fc
...@@ -43,8 +43,7 @@ ogm_header(AVFormatContext *s, int idx) ...@@ -43,8 +43,7 @@ ogm_header(AVFormatContext *s, int idx)
if(!(*p & 1)) if(!(*p & 1))
return 0; return 0;
if(*p != 1) if(*p == 1) {
return 1;
p++; p++;
...@@ -93,6 +92,10 @@ ogm_header(AVFormatContext *s, int idx) ...@@ -93,6 +92,10 @@ ogm_header(AVFormatContext *s, int idx)
st->time_base.num = 1; st->time_base.num = 1;
st->time_base.den = st->codec->sample_rate; 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; return 1;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment