Michael Niedermayer 209001073a 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@gmx.at>

2015-03-15 22:18:41 +01:00

2.5 KiB

Raw Blame History

View Raw