ref: 771fc832f3889c067b76899c8209bd0854ba7f7d
parent: 513157e0939b2774db583a31fe29c9d34948e09c
parent: 8015a9aedc2358135940180884f0b9bba9509009
author: John Koleszar <jkoleszar@google.com>
date: Wed Mar 27 06:41:29 EDT 2013
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