Merge commit 'aaa44d0299338e3bc90128816c21dbfab06cdb48'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 29 Nov 2013 03:00:59 +0000 (04:00 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 29 Nov 2013 03:00:59 +0000 (04:00 +0100)
commit97468463a239a6767a9c7ad0ed2f9f03e61f5d1a
tree754c8ada57061ee5b673fddc1c4ed22974174ed1
parent7ea9c4a94c139aafabba8fe9746e1a8d71e656d3
parentaaa44d0299338e3bc90128816c21dbfab06cdb48
Merge commit 'aaa44d0299338e3bc90128816c21dbfab06cdb48'

* commit 'aaa44d0299338e3bc90128816c21dbfab06cdb48':
  dca: support mixing LFE in dca_downmix.

Conflicts:
libavcodec/dcadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/dcadata.h
libavcodec/dcadec.c