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
..
common	Merge "Removed shadow warnings : postproc.c decodframe.c threading.c"	2013-04-19 07:19:14 -07:00
decoder	Merge "Removed shadow warnings : postproc.c decodframe.c threading.c"	2013-04-19 07:19:14 -07:00
encoder	Merge branch 'master' into experimental	2013-04-26 12:57:10 -07:00
exports_dec	Rename vp8/ codec directory to vp9/.	2012-11-01 16:31:22 -07:00
exports_enc	Rename vp8/ codec directory to vp9/.	2012-11-01 16:31:22 -07:00
vp8_common.mk	prefix vp8 asm_{com,dec,enc}_offsets files	2013-03-02 14:45:40 -08:00
vp8_cx_iface.c	Merge branch 'experimental' into master	2013-04-16 06:49:46 -07:00
vp8_dx_iface.c	Merge branch 'experimental' into master	2013-04-16 06:49:46 -07:00
vp8cx_arm.mk	Each make file is responsible for its own directory	2012-11-15 16:41:03 -08:00
vp8cx.mk	Rename quantize_sse2_intrinsics.c	2013-04-24 09:08:56 -07:00
vp8dx.mk	prefix vp8 asm_{com,dec,enc}_offsets files	2013-03-02 14:45:40 -08:00