Merge branch 'master' into experimental
authorJohn Koleszar <jkoleszar@google.com>
Wed, 27 Mar 2013 17:41:29 +0000 (10:41 -0700)
committerJohn Koleszar <jkoleszar@google.com>
Wed, 27 Mar 2013 17:46:19 +0000 (10:46 -0700)
commit771fc832f3889c067b76899c8209bd0854ba7f7d
tree617379cd79f034d2ea2f709e90ab59105bbfc7cc
parent513157e0939b2774db583a31fe29c9d34948e09c
parent8015a9aedc2358135940180884f0b9bba9509009
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
configure
test/decode_test_driver.cc
test/decode_test_driver.h
test/encode_test_driver.cc
test/test.mk
vp8/encoder/bitstream.c
vp8/encoder/onyx_if.c
vp8/encoder/x86/quantize_sse2_intrinsics.c
vp8/vp8cx.mk
vpxenc.c