-
Michael Niedermayer authored
* commit '44b17d79': dca: extract core substream's embedded downmix coeffcient codes, if present. Conflicts: libavcodec/dcadata.h libavcodec/dcadec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
43ec4563
* commit '44b17d79': dca: extract core substream's embedded downmix coeffcient codes, if present. Conflicts: libavcodec/dcadata.h libavcodec/dcadec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>