lineage-rockchip/android_external_ffmpeg
1
0
Fork 0
Code Activity Actions

Merge commit 'db68ef898a'

Browse source 
* commit 'db68ef898a':
  ogg: update event_flags with STREAM_/METADATA_UPDATED whenever metadata changes.

Conflicts:
	libavformat/oggparsevorbis.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-08-14 00:04:42 +02:00
commit a8db787932
9 changed files with 30 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
libavformat/flacdec.c
View file

@ -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 */