Changeset 97468463 in ffmpeg

Timestamp:

Nov 29, 2013, 3:00:59 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

3f41e57f

Parents:

7ea9c4a9 (diff), aaa44d02 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge commit 'aaa44d0299338e3bc90128816c21dbfab06cdb48'

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

Conflicts:

libavcodec/dcadec.c

Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)