Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 16 Oct 2012 12:15:16 +0000 (14:15 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 16 Oct 2012 12:15:16 +0000 (14:15 +0200)
commit8227d36bd3569efe0f1a4e3ad877e516497666a4
tree01ee1701eddc6a3033ef45b64fa64c6a52636d50
parent83962004f7275a4ea98ca02398ae5dfff59e5fb7
parent07b3790d36266358e3bda19cec3b843e5129a986
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  build: simplify linking tools with cmdutils.o
  tiny_psnr: fix range calculation for sample size of 32 bits

Conflicts:
Makefile
tests/tiny_psnr.c

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