Changeset 1db87da3 in ffmpeg

Timestamp:

Feb 16, 2014, 1:18:58 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

bbd8fd03

Parents:

a2bc6c11 (diff), 9cd4bc41 (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 '9cd4bc41760f8ad879e248920eacbe1e7757152c'

• commit '9cd4bc41760f8ad879e248920eacbe1e7757152c': ac3dec: set AV_FRAME_DATA_DOWNMIX_INFO side data.

Conflicts:

libavcodec/version.h

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

(No files)