summaryrefslogtreecommitdiff
path: root/libavformat/flacdec.c
diff options
context:
space:
mode:
authorDavid Conrad <lessen42@gmail.com>2010-03-12 05:16:44 +0000
committerDavid Conrad <lessen42@gmail.com>2010-03-12 05:16:44 +0000
commitb53cde48bdc807fe5126eee7dc116812c6607974 (patch)
treeb336762104972379b9ac19793af70763c5f0bc47 /libavformat/flacdec.c
parente4d2d8c5d720d84997a24178acd9553f23077c03 (diff)
oggdec: Metadata is per-stream; don't merge multiple streams' together
Originally committed as revision 22473 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/flacdec.c')
-rw-r--r--libavformat/flacdec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/flacdec.c b/libavformat/flacdec.c
index d7f1e715d8..495fa2b4a0 100644
--- a/libavformat/flacdec.c
+++ b/libavformat/flacdec.c
@@ -113,7 +113,7 @@ static int flac_read_header(AVFormatContext *s,
}
/* process supported blocks other than STREAMINFO */
if (metadata_type == FLAC_METADATA_TYPE_VORBIS_COMMENT) {
- if (ff_vorbis_comment(s, buffer, metadata_size)) {
+ if (ff_vorbis_comment(s, &s->metadata, buffer, metadata_size)) {
av_log(s, AV_LOG_WARNING, "error parsing VorbisComment metadata\n");
}
}