From: John Koleszar <jkoleszar@google.com>
Date: Fri, 18 Feb 2011 05:05:10 +0000 (-0500)
Subject: Merge remote branch 'origin/master' into experimental
X-Git-Tag: v1.3.0~1217^2~494
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4fafc4d985debd3e9ec41b1c0ab447e32d2a9db9;p=libvpx

Merge remote branch 'origin/master' into experimental

Change-Id: I8999a33db82d38eb85482f3c423db238d6ee3ed9
---

4fafc4d985debd3e9ec41b1c0ab447e32d2a9db9
diff --cc vp8/encoder/psnr.c
index ff0222e2d,96b0ea890..abd2ed47c
--- a/vp8/encoder/psnr.c
+++ b/vp8/encoder/psnr.c
@@@ -11,9 -11,9 +11,9 @@@
  
  #include "vpx_scale/yv12config.h"
  #include "math.h"
- #include "systemdependent.h" /* for vp8_clear_system_state() */
+ #include "vp8/common/systemdependent.h" /* for vp8_clear_system_state() */
  
 -#define MAX_PSNR 60
 +#define MAX_PSNR 100
  
  double vp8_mse2psnr(double Samples, double Peak, double Mse)
  {