* commit 'f5fac6f7':
  asfdec: support reading ID3v2 tags in ASF files

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