-
Michael Niedermayer authored
* commit '3802833b': dca: Respect the current limits in the downmixing capabilities Conflicts: libavcodec/dcadec.c See: 8e77c384Merged-by: Michael Niedermayer <michaelni@gmx.at>
cce25437
* commit '3802833b': dca: Respect the current limits in the downmixing capabilities Conflicts: libavcodec/dcadec.c See: 8e77c384Merged-by: Michael Niedermayer <michaelni@gmx.at>