[FFmpeg-cvslog] Merge commit 'dd33637c18629c3e554ebb146bbeb45c9745a5cf'

Michael Niedermayer git at videolan.org
Wed Oct 16 12:12:12 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Oct 16 12:02:38 2013 +0200| [6659eb71167461e3cc6e87df028b97bab8fcf8a5] | committer: Michael Niedermayer

Merge commit 'dd33637c18629c3e554ebb146bbeb45c9745a5cf'

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

Conflicts:
	tests/tiny_psnr.c

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

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





More information about the ffmpeg-cvslog mailing list