| commit | 771fc832f3889c067b76899c8209bd0854ba7f7d | [log] [tgz] |
|---|---|---|
| author | John Koleszar <jkoleszar@google.com> | Wed Mar 27 10:41:29 2013 -0700 |
| committer | John Koleszar <jkoleszar@google.com> | Wed Mar 27 10:46:19 2013 -0700 |
| tree | 617379cd79f034d2ea2f709e90ab59105bbfc7cc | |
| parent | 513157e0939b2774db583a31fe29c9d34948e09c [diff] | |
| parent | 8015a9aedc2358135940180884f0b9bba9509009 [diff] |
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