* commit '3e589878':
  Voxware MetaSound decoder

Conflicts:
	Changelog
	libavcodec/Makefile
	libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>