Merge commit 'cc3e88a2b9e7ecf62e4ea1c41ce1623cea67ee96'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Aug 2014 21:51:03 +0000 (23:51 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Aug 2014 21:51:03 +0000 (23:51 +0200)
commita90364d001eb8289e1c423bf9884bb0affc3f662
tree6ea390e2b332387ad8686bf6719d73e283ae3364
parent1110a030c73291e7df30e8e755cb14351ac924e8
parentcc3e88a2b9e7ecf62e4ea1c41ce1623cea67ee96
Merge commit 'cc3e88a2b9e7ecf62e4ea1c41ce1623cea67ee96'

* commit 'cc3e88a2b9e7ecf62e4ea1c41ce1623cea67ee96':
  mov: update AVFormatContext.event_flags with METADATA_UPDATED whenever metadata changes.

Conflicts:
libavformat/mov.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/mov.c