diff options
| author | John Koleszar <jkoleszar@google.com> | 2010-12-03 13:30:50 -0500 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2010-12-03 13:30:50 -0500 |
| commit | 5e76dfcc70527b05c5106aef9b8aeffd64d21a17 (patch) | |
| tree | a0d40b33592af5aecc4f68fc0ab7b1acdee392db /vp8/vp8_cx_iface.c | |
| parent | 9c8ad79fdc8af25988dd071703a51d379f2849ce (diff) | |
| parent | 8d0f7a01e6727253df0d3c8625568bc39e83b6f4 (diff) | |
| download | libvpx-5e76dfcc70527b05c5106aef9b8aeffd64d21a17.tar libvpx-5e76dfcc70527b05c5106aef9b8aeffd64d21a17.tar.gz libvpx-5e76dfcc70527b05c5106aef9b8aeffd64d21a17.tar.bz2 libvpx-5e76dfcc70527b05c5106aef9b8aeffd64d21a17.zip | |
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
Diffstat (limited to 'vp8/vp8_cx_iface.c')
0 files changed, 0 insertions, 0 deletions