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	…
x86-msvs	…
.gitattributes	…
.gitignore	…