[FFmpeg-cvslog] Merge commit '26e8fa3b508eb047e85f4e923fc8e82a1aa656ba'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Tue Sep 29 15:44:28 2015 +0200| [fc97b1f091ff38210699b2e5819c94e4f4ebd1fa] | committer: Hendrik Leppkes

Merge commit '26e8fa3b508eb047e85f4e923fc8e82a1aa656ba'

* commit '26e8fa3b508eb047e85f4e923fc8e82a1aa656ba':
  tiny_psnr: Use the correct abs() version

Merged-by: Hendrik Leppkes <h.leppkes at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fc97b1f091ff38210699b2e5819c94e4f4ebd1fa
---