Merge commit 'dd33637c18629c3e554ebb146bbeb45c9745a5cf'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 16 Oct 2013 10:02:38 +0000 (12:02 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 16 Oct 2013 10:07:02 +0000 (12:07 +0200)
commit6659eb71167461e3cc6e87df028b97bab8fcf8a5
tree2c89e81cfe0347672ffa8ee595a9a6e2e48f09fd
parent8895b71d6fc107c51b1bbc32323da5b2a617e842
parentdd33637c18629c3e554ebb146bbeb45c9745a5cf
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>
tests/tiny_psnr.c