Changeset aa36dcf in ffmpeg

Timestamp:

Jan 31, 2014, 2:26:53 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

fff29531

Parents:

3f9e2aad (diff), 04ffd22 (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/31/14 14:24:35)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (01/31/14 14:26:53)

Message:

Merge remote-tracking branch 'qatar/master'

• qatar/master: fate: add xvid test for custom matrices

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

(No files)