ref: 32a5c52856743c5cce39f73bfc3e6aa77527a8c5
parent: 80fadb261e62a05ba0a22ce8abeb6e1c945c082f
parent: e58852582d9b785e09dd202c302881a5faf941d2
author: Johann <johann.koenig@duck.com>
date: Fri Apr 26 07:40:43 EDT 2013
Merge branch 'master' into experimental Conflicts: vp9/common/vp9_findnearmv.c vp9/common/vp9_rtcd_defs.sh vp9/decoder/vp9_decodframe.c vp9/decoder/x86/vp9_dequantize_sse2.c vp9/encoder/vp9_rdopt.c vp9/vp9_common.mk Resolve file name changes in favor of master. Resolve rdopt changes in favor of experimental, preserving the newer experiments. Change-Id: If51ed8f457470281c7b20a5c1a2f4ce2cf76c20f