Changeset eeb6efcd in ffmpeg

Timestamp:

Apr 11, 2013, 11:28:24 AM (12 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

f1e606c7

Parents:

32a7b858 (diff), 08dd2c9d (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> (04/11/13 11:28:19)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (04/11/13 11:28:24)

Message:

Merge remote-tracking branch 'cigaes/master'

• cigaes/master: fate: add tests for unknown channel layouts. lavfi/buffersrc: update for compatibility with the fork.

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

(No files)