Merge 'Add simple version of activity masking.'
authorJohn Koleszar <jkoleszar@google.com>
Fri, 3 Dec 2010 18:30:50 +0000 (13:30 -0500)
committerJohn Koleszar <jkoleszar@google.com>
Fri, 3 Dec 2010 18:30:50 +0000 (13:30 -0500)
commit5e76dfcc70527b05c5106aef9b8aeffd64d21a17
treea0d40b33592af5aecc4f68fc0ab7b1acdee392db
parent9c8ad79fdc8af25988dd071703a51d379f2849ce
parent8d0f7a01e6727253df0d3c8625568bc39e83b6f4
Merge 'Add simple version of activity masking.'

Merge commit 'refs/changes/79/779/2' of
    https://review.webmproject.org/p/libvpx

Conflicts:
vp8/encoder/encodeintra.c
vp8/encoder/encodemb.c

Change-Id: Id607063fabe92d99eeb3c380e8ca670b01bfb3ef
vp8/encoder/block.h
vp8/encoder/encodeframe.c
vp8/encoder/encodeintra.c
vp8/encoder/encodemb.c
vp8/encoder/onyx_if.c
vp8/encoder/onyx_int.h