Changeset 42138f63 in ffmpeg

Timestamp:

Apr 1, 2014, 1:24:50 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

0054bbd6

Parents:

95582b5c (diff), 06688e96 (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 01:23:36)

git-committer:

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

Message:

Merge commit '06688e96fb9577bc7466a380bf7a14fa745208db'

• commit '06688e96fb9577bc7466a380bf7a14fa745208db': fate: add exr tests

Conflicts:

tests/fate/image.mak

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

(No files)