[FFmpeg-cvslog] Merge commit '217e4ff4d1f845b76e44634e29371cd09313d1c2'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Mar 15 21:44:06 2015 +0100| [209001073adf190ccf2e578f25d4b3d41b1640a0] | committer: Michael Niedermayer

Merge commit '217e4ff4d1f845b76e44634e29371cd09313d1c2'

* commit '217e4ff4d1f845b76e44634e29371cd09313d1c2':
  dca: Support for XLL (lossless extension)

Conflicts:
	Changelog
	doc/general.texi
	libavcodec/Makefile
	libavcodec/dca.h
	libavcodec/dca_exss.c
	libavcodec/dcadata.h
	libavcodec/dcadec.c
	libavcodec/version.h

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

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