From: Johann <johannkoenig@google.com>
Date: Fri, 3 Apr 2015 19:53:16 +0000 (-0700)
Subject: Merge branch 'indianrunnerduck'
X-Git-Tag: v1.5.0~791^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=79bd0713738a318be2c7005a5ed8d44a7258255a;p=libvpx

Merge branch 'indianrunnerduck'

* indianrunnerduck:
  Update CHANGELOG for v1.4.0 (Indian Runner Duck) release
  vp9: fix high-bitdepth NEON build
  Fix use of scaling in joint motion search
  Prepare Release Candidate for libvpx v1.4.0
  vp8cx.h: vpx/vpx_encoder.h -> ./vpx_encoder.h

Change-Id: Ib2eee50f02e12623aae478871cb9150604bb2ac2
---

79bd0713738a318be2c7005a5ed8d44a7258255a