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

@@ -132,6 +132,9 @@ extern const struct ogg_codec ff_vp8_codec;

 int ff_vorbis_comment(AVFormatContext *ms, AVDictionary **m,

                       const uint8_t *buf, int size, int parse_picture);

+int ff_vorbis_stream_comment(AVFormatContext *as, AVStream *st,

+                             const uint8_t *buf, int size);

+

 static inline int

 ogg_find_stream (struct ogg * ogg, int serial)

 {

@@ -74,7 +74,7 @@ static int celt_header(AVFormatContext *s, int idx)

     } else if (priv && priv->extra_headers_left) {

         /* Extra headers (vorbiscomment) */

-        ff_vorbis_comment(s, &st->metadata, p, os->psize, 1);

+        ff_vorbis_stream_comment(s, st, p, os->psize);

         priv->extra_headers_left--;

         return 1;

     } else {

@@ -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;

@@ -111,7 +111,7 @@ ogm_header(AVFormatContext *s, int idx)

     } else if (bytestream2_peek_byte(&p) == 3) {

         bytestream2_skip(&p, 7);

         if (bytestream2_get_bytes_left(&p) > 1)

-            ff_vorbis_comment(s, &st->metadata, p.buffer, bytestream2_get_bytes_left(&p) - 1, 1);

+            ff_vorbis_stream_comment(s, st, p.buffer, bytestream2_get_bytes_left(&p) - 1);

     }

     return 1;

@@ -78,7 +78,7 @@ static int opus_header(AVFormatContext *avf, int idx)

     if (priv->need_comments) {

         if (os->psize < 8 || memcmp(packet, "OpusTags", 8))

             return AVERROR_INVALIDDATA;

-        ff_vorbis_comment(avf, &st->metadata, packet + 8, os->psize - 8, 1);

+        ff_vorbis_stream_comment(avf, st, packet + 8, os->psize - 8);

         priv->need_comments--;

         return 1;

     }

@@ -83,7 +83,7 @@ static int speex_header(AVFormatContext *s, int idx) {

         avpriv_set_pts_info(st, 64, 1, st->codec->sample_rate);

     } else

-        ff_vorbis_comment(s, &st->metadata, p, os->psize, 1);

+        ff_vorbis_stream_comment(s, st, p, os->psize);

     spxp->seq++;

     return 1;

@@ -116,7 +116,7 @@ static int theora_header(AVFormatContext *s, int idx)

     }

     break;

     case 0x81:

-        ff_vorbis_comment(s, &st->metadata, os->buf + os->pstart + 7, os->psize - 7, 1);

+        ff_vorbis_stream_comment(s, st, os->buf + os->pstart + 7, os->psize - 7);

     case 0x82:

         if (!thp->version)

             return AVERROR_INVALIDDATA;

@@ -71,12 +71,25 @@ static int ogm_chapter(AVFormatContext *as, uint8_t *key, uint8_t *val)

     return 1;

 }

+int ff_vorbis_stream_comment(AVFormatContext *as, AVStream *st,

+                             const uint8_t *buf, int size)

+{

+    int updates = ff_vorbis_comment(as, &st->metadata, buf, size, 1);

+

+    if (updates > 0) {

+        st->event_flags |= AVSTREAM_EVENT_FLAG_METADATA_UPDATED;

+    }

+

+    return updates;

+}

+

 int ff_vorbis_comment(AVFormatContext *as, AVDictionary **m,

                       const uint8_t *buf, int size,

                       int parse_picture)

 {

     const uint8_t *p   = buf;

     const uint8_t *end = buf + size;

+    int updates        = 0;

     unsigned n, j;

     int s;

@@ -158,6 +171,7 @@ int ff_vorbis_comment(AVFormatContext *as, AVDictionary **m,

                     continue;

                 }

             } else if (!ogm_chapter(as, tt, ct)) {

+                updates++;

                 if (av_dict_get(*m, tt, NULL, 0)) {

                     av_dict_set(m, tt, ";", AV_DICT_APPEND);

                 }

@@ -178,7 +192,7 @@ int ff_vorbis_comment(AVFormatContext *as, AVDictionary **m,

     ff_metadata_conv(m, NULL, ff_vorbiscomment_metadata_conv);

-    return 0;

+    return updates;

 }

 /*

@@ -256,8 +270,8 @@ static int vorbis_update_metadata(AVFormatContext *s, int idx)

     /* New metadata packet; release old data. */

     av_dict_free(&st->metadata);

-    ret = ff_vorbis_comment(s, &st->metadata, os->buf + os->pstart + 7,

-                            os->psize - 8, 1);

+    ret = ff_vorbis_stream_comment(s, st, os->buf + os->pstart + 7,

+                                   os->psize - 8);

     if (ret < 0)

         return ret;