Merge commit 'db68ef898a3802e51b6f41fd600d0d46d058e3f8'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Aug 2014 22:04:42 +0000 (00:04 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Aug 2014 22:05:49 +0000 (00:05 +0200)
commita8db787932ad71ac4f77b61357b695c3b35a283d
treee629c6cefe3230012fdbcf145f522b13b1fcc367
parenta90364d001eb8289e1c423bf9884bb0affc3f662
parentdb68ef898a3802e51b6f41fd600d0d46d058e3f8
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>
libavformat/flacdec.c
libavformat/oggdec.h
libavformat/oggparsecelt.c
libavformat/oggparseflac.c
libavformat/oggparseogm.c
libavformat/oggparseopus.c
libavformat/oggparsespeex.c
libavformat/oggparsetheora.c
libavformat/oggparsevorbis.c