Changeset b0ed88b4 in ffmpeg

Timestamp:

Nov 8, 2014, 11:26:55 AM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

6f21fb79

Parents:

9ebfe38f (diff), 4436a8f4 (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> (11/08/14 11:26:50)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (11/08/14 11:26:55)

Message:

Merge remote-tracking branch 'cehoyos/master'

• cehoyos/master: Remove fminf() emulation.

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

(No files)