make -short work with -print_ssim, -print_psnr, etc.

PSNR was always printed when using -short

Change-Id: I826785917961d355a980e4ac27dd1cf1295cb6de