Merge "Remove old activity masking code."
authorPaul Wilkins <paulwilkins@google.com>
Wed, 16 Apr 2014 21:24:25 +0000 (14:24 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Wed, 16 Apr 2014 21:24:25 +0000 (14:24 -0700)
1  2 
vp9/encoder/vp9_encodeframe.c
vp9/encoder/vp9_onyx_if.c
vp9/encoder/vp9_onyx_int.h

Simple merge
Simple merge
Simple merge