[FFmpeg-cvslog] Merge commit '3dc06b6972cf389269e9c36ff0a4373f80f7149b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Oct 16 14:04:14 2012 +0200| [83962004f7275a4ea98ca02398ae5dfff59e5fb7] | committer: Michael Niedermayer

Merge commit '3dc06b6972cf389269e9c36ff0a4373f80f7149b'

* commit '3dc06b6972cf389269e9c36ff0a4373f80f7149b':
  tiny_psnr: check for specified sample size less than 1
  fate: improve md5sum utility selection
  rangecoder-test: Drop timer output that clutters stderr

Conflicts:
	tests/tiny_psnr.c

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

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