aom/build
John Koleszar 771fc832f3 Merge branch 'master' into experimental
Pick up VP8 encryption, quantization changes, and some fixes to vpxenc

Conflicts:
	test/decode_test_driver.cc
	test/decode_test_driver.h
	test/encode_test_driver.cc
	vp8/vp8cx.mk
	vpxdec.c
	vpxenc.c

Change-Id: I9fbcc64808ead47e22f1f22501965cc7f0c4791c
2013-03-27 10:46:19 -07:00
..
make Merge branch 'master' into experimental 2013-03-27 10:46:19 -07:00
x86-msvs prefix vp8 asm_{com,dec,enc}_offsets files 2013-03-02 14:45:40 -08:00
.gitattributes VisualStudio projects: asm tool updates 2010-06-14 17:29:14 -04:00
.gitignore Initial WebM release 2010-05-18 11:58:33 -04:00