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/flacdec.c | |
| parent | a90364d001eb8289e1c423bf9884bb0affc3f662 (diff) | |
| parent | db68ef898a3802e51b6f41fd600d0d46d058e3f8 (diff) | |
| download | ffmpeg-a8db787932ad71ac4f77b61357b695c3b35a283d.tar.gz | |
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/flacdec.c')
| -rw-r--r-- | libavformat/flacdec.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavformat/flacdec.c b/libavformat/flacdec.c index c4f9d86a8b..c291393954 100644 --- a/libavformat/flacdec.c +++ b/libavformat/flacdec.c @@ -138,8 +138,11 @@ static int flac_read_header(AVFormatContext *s) if (metadata_type == FLAC_METADATA_TYPE_VORBIS_COMMENT) { AVDictionaryEntry *chmask; - if (ff_vorbis_comment(s, &s->metadata, buffer, metadata_size, 1)) { + ret = ff_vorbis_comment(s, &s->metadata, buffer, metadata_size, 1); + if (ret < 0) { av_log(s, AV_LOG_WARNING, "error parsing VorbisComment metadata\n"); + } else if (ret > 0) { + s->event_flags |= AVFMT_EVENT_FLAG_METADATA_UPDATED; } /* parse the channels mask if present */ |