* commit 'a96f51f29ac4cd95650a8bcda6c3d5d87c6357fa': dca: Return more informative error codes Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit 'b339019de4e5f4d3c661bbdba98ae248ab77e2f0': 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>