Changeset 6537b898 in ffmpeg

Timestamp:

Apr 1, 2014, 2:52:20 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

9595f367

Parents:

767b1daf (diff), 55c6e599 (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/01/14 02:24:25)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (04/01/14 02:52:20)

Message:

Merge remote-tracking branch 'qatar/master'

• qatar/master: fate: add SGI tests

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

(No files)