8 commits

Author	SHA1	Message	Date
Michael Niedermayer	209001073a	Merge commit '217e4ff4d1' ... * commit '217e4ff4d1': 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
Niels Möller	217e4ff4d1	dca: Support for XLL (lossless extension) ... Cleanup and integration by Diego Biurrun. Signed-off-by: Diego Biurrun <diego@biurrun.de>	2015-03-15 14:51:36 +01:00
Michael Niedermayer	d2668ae472	Merge commit 'f8c1719771' ... * commit 'f8c1719771': dca: Remove separate header for DCA ExSS Conflicts: libavcodec/dca.h libavcodec/dca_exss.h Merged-by: Michael Niedermayer <michaelni@gmx.at>	2015-02-17 20:18:19 +01:00
Diego Biurrun	f8c1719771	dca: Remove separate header for DCA ExSS ... There is no point in having a separate header for a single declaration.	2015-02-16 10:44:56 +01:00
Michael Niedermayer	877c038a9d	Merge commit 'a96f51f29a' ... * commit 'a96f51f29a': dca: Return more informative error codes Merged-by: Michael Niedermayer <michaelni@gmx.at>	2015-02-14 22:26:00 +01:00
Michael Niedermayer	d8901c2f01	Merge commit 'b339019de4' ... * commit 'b339019de4': dca: Split code for handling the EXSS extension off into a separate file Conflicts: libavcodec/Makefile libavcodec/dcadec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2015-02-14 22:02:41 +01:00
Diego Biurrun	a96f51f29a	dca: Return more informative error codes	2015-02-14 10:13:49 -08:00
Diego Biurrun	b339019de4	dca: Split code for handling the EXSS extension off into a separate file	2015-02-14 10:13:49 -08:00