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

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