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
..
2012-07-25 17:11:16 -07:00
2013-02-26 09:23:01 -08:00
2013-03-05 12:45:40 -08:00
2013-02-05 15:43:03 -08:00
2012-07-24 10:48:44 +01:00
2013-01-23 21:56:15 -08:00
2013-02-22 16:25:14 -08:00