[FFmpeg-cvslog] Merge commit '3e5898782dce60334ab294821ca00b19c648cf66'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Aug  8 12:10:39 2013 +0200| [69ea65b46f1a101f9a4f2c914c75b752122e7cbe] | committer: Michael Niedermayer

Merge commit '3e5898782dce60334ab294821ca00b19c648cf66'

* commit '3e5898782dce60334ab294821ca00b19c648cf66':
  Voxware MetaSound decoder

Conflicts:
	Changelog
	libavcodec/Makefile
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=69ea65b46f1a101f9a4f2c914c75b752122e7cbe
---