Merge "Further activity masking changes:"
authorYaowu Xu <yaowu@google.com>
Wed, 8 Jun 2011 16:30:31 +0000 (09:30 -0700)
committerCode Review <code-review@webmproject.org>
Wed, 8 Jun 2011 16:30:31 +0000 (09:30 -0700)
1  2 
vp8/encoder/encodeframe.c

Simple merge