projects
/
platform
/
upstream
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
533c30f
)
oggdec: Read ogm metadata
author
David Conrad
<lessen42@gmail.com>
Fri, 12 Mar 2010 05:16:51 +0000
(
05:16
+0000)
committer
David Conrad
<lessen42@gmail.com>
Fri, 12 Mar 2010 05:16:51 +0000
(
05:16
+0000)
Originally committed as revision 22475 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavformat/oggparseogm.c
patch
|
blob
|
history
diff --git
a/libavformat/oggparseogm.c
b/libavformat/oggparseogm.c
index
beeb27d
..
e7c1853
100644
(file)
--- 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;
}