Changeset 62094e2f in ffmpeg

Timestamp:

Mar 27, 2014, 12:59:32 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

cf3bfc97

Parents:

12ab07be (diff), 9718c31e (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.

Message:

Merge remote-tracking branch 'qatar/master'

• qatar/master: fate: add Alias PIX tests

Conflicts:

tests/fate/image.mak

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

(No files)