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

..

ads2gas_apple.pl

Include apple arm conversion script

2013-01-25 12:18:39 -08:00

ads2gas.pl

Fix ads2gas script to look for ALIGN as a word.

2012-12-10 16:30:32 -08:00

Android.mk

Fix Android ndk-build

2013-04-17 10:52:50 -07:00

armlink_adapter.sh

Translates -g from LDFLAGS as --debug in armlink_adapter.sh

2011-02-07 08:58:19 +02:00

configure.sh

Merge branch 'master' into experimental

2013-04-26 12:57:10 -07:00

gen_asm_deps.sh

build: merge with master

2012-11-05 12:39:39 -08:00

gen_msvs_def.sh

Use WebM in copyright notice for consistency

2010-09-09 10:01:21 -04:00

gen_msvs_proj.sh

remove yasm.rules

2012-11-16 11:09:26 -08:00

gen_msvs_sln.sh

purge wince configuration

2011-02-22 14:42:00 -05:00

Makefile

prefix vp8 asm_{com,dec,enc}_offsets files

2013-03-02 14:45:40 -08:00

obj_int_extract.c

prefix vp8 asm_{com,dec,enc}_offsets files

2013-03-02 14:45:40 -08:00

rtcd.sh

rtcd: make include guard unique

2013-02-22 16:05:00 -08:00

version.sh

Use WebM in copyright notice for consistency

2010-09-09 10:01:21 -04:00