Changeset cb751a6a in ffmpeg

Timestamp:

Nov 28, 2013, 11:18:42 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

e9a47896

Parents:

d1daa71f (diff), 89de5157 (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.

git-author:

Michael Niedermayer <michaelni@gmx.at> (11/28/13 22:15:35)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (11/28/13 23:18:42)

Message:

Merge commit '89de5157b1cbe7807d3ec1d51bd56a75e98c002e'

• commit '89de5157b1cbe7807d3ec1d51bd56a75e98c002e': dcadec: implement request_channel_layout.

Conflicts:

libavcodec/dcadec.c

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

(No files)