Johann 32a5c52856 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		2013-04-26 12:57:10 -07:00
..
vp9_dequantize_sse2.c	Merge branch 'master' into experimental	2013-04-26 12:57:10 -07:00
vp9_idct_blk_sse2.c	Moved dequantization into the token decoder	2013-04-22 17:53:07 -04:00