diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-29 04:00:59 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-29 04:00:59 +0100 |
commit | 97468463a239a6767a9c7ad0ed2f9f03e61f5d1a (patch) | |
tree | 754c8ada57061ee5b673fddc1c4ed22974174ed1 /RELEASE | |
parent | 7ea9c4a94c139aafabba8fe9746e1a8d71e656d3 (diff) | |
parent | aaa44d0299338e3bc90128816c21dbfab06cdb48 (diff) | |
download | ffmpeg-97468463a239a6767a9c7ad0ed2f9f03e61f5d1a.tar.gz |
Merge commit 'aaa44d0299338e3bc90128816c21dbfab06cdb48'
* commit 'aaa44d0299338e3bc90128816c21dbfab06cdb48':
dca: support mixing LFE in dca_downmix.
Conflicts:
libavcodec/dcadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'RELEASE')
0 files changed, 0 insertions, 0 deletions