Merge commit '0af3b65880573aa9b3375362eaab4f84140c7dde'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 3 Mar 2015 20:16:31 +0000 (21:16 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 3 Mar 2015 20:16:31 +0000 (21:16 +0100)
commit0dd53e14f9684a787d6c66d3cb44afb0a6bb2b7b
tree8cabd5eee3f865caaa4d1f259ea19fe8e2a16139
parentb7d3fbc69bb60ab2c1369ac5ba20f23565a4db8d
parent0af3b65880573aa9b3375362eaab4f84140c7dde
Merge commit '0af3b65880573aa9b3375362eaab4f84140c7dde'

* commit '0af3b65880573aa9b3375362eaab4f84140c7dde':
  asf: do not export XMP metadata by default

Conflicts:
libavformat/asfdec.c
libavformat/version.h

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