Changeset 5a1aa559 in ffmpeg

Timestamp:

Oct 17, 2014, 6:35:43 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

e18fc35a

Parents:

242f8bb3 (diff), b01a2204 (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 'b01a2204b5cff7bb920f42fda1bb0103f450fe93'

• commit 'b01a2204b5cff7bb920f42fda1bb0103f450fe93': libfdk-aacdec: Enable Decoder Downmix including Downmix Metadata Support

Conflicts:

libavcodec/libfdk-aacdec.c
libavcodec/version.h

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

(No files)