Skip to content
Snippets Groups Projects
Commit 5e76dfcc authored by John Koleszar's avatar John Koleszar
Browse files

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
parents 9c8ad79f 8d0f7a01
No related merge requests found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment