Changeset 6659eb71 in ffmpeg

Timestamp:

Oct 16, 2013, 10:07:02 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

8778c49a

Parents:

8895b71d (diff), dd33637 (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> (10/16/13 10:02:38)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (10/16/13 10:07:02)

Message:

Merge commit 'dd33637c18629c3e554ebb146bbeb45c9745a5cf'

• commit 'dd33637c18629c3e554ebb146bbeb45c9745a5cf': tiny_psnr: switch f32 handling to floating point

Conflicts:

tests/tiny_psnr.c

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

(No files)