Changeset ad5e4e0f in ffmpeg

Timestamp:

Jan 4, 2014, 1:47:34 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

fb17f03d

Parents:

cf867517 (diff), b318106f (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> (01/04/14 01:40:32)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (01/04/14 01:47:34)

Message:

Merge commit 'b318106fae65149356934fc72feafef3272fd4ea'

• commit 'b318106fae65149356934fc72feafef3272fd4ea': FATE: add a test for the lavr mixing case fixed in fc6a3ef40d34ce8443ae57c2452f3f273d7d4891

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

(No files)