• John Koleszar's avatar
    Merge branch 'master' into experimental · 771fc832
    John Koleszar authored
    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
    771fc832
decode_test_driver.h 3.21 KB