diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-14 00:04:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-14 00:05:49 +0200 |
| commit | a8db787932ad71ac4f77b61357b695c3b35a283d (patch) | |
| tree | e629c6cefe3230012fdbcf145f522b13b1fcc367 /libavformat/oggparseflac.c | |
| parent | a90364d001eb8289e1c423bf9884bb0affc3f662 (diff) | |
| parent | db68ef898a3802e51b6f41fd600d0d46d058e3f8 (diff) | |
Merge commit 'db68ef898a3802e51b6f41fd600d0d46d058e3f8'
* commit 'db68ef898a3802e51b6f41fd600d0d46d058e3f8':
ogg: update event_flags with STREAM_/METADATA_UPDATED whenever metadata changes.
Conflicts:
libavformat/oggparsevorbis.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/oggparseflac.c')
| -rw-r--r-- | libavformat/oggparseflac.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/oggparseflac.c b/libavformat/oggparseflac.c index 875de2a3b4..9f0f808b37 100644 --- a/libavformat/oggparseflac.c +++ b/libavformat/oggparseflac.c @@ -68,7 +68,7 @@ flac_header (AVFormatContext * s, int idx) avpriv_set_pts_info(st, 64, 1, st->codec->sample_rate); } else if (mdt == FLAC_METADATA_TYPE_VORBIS_COMMENT) { - ff_vorbis_comment (s, &st->metadata, os->buf + os->pstart + 4, os->psize - 4, 1); + ff_vorbis_stream_comment(s, st, os->buf + os->pstart + 4, os->psize - 4); } return 1; |