diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-05-26 11:44:18 -0400 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-05-26 11:44:36 -0400 |
| commit | 9dccdc1f0884426d5c7340129660787b64812dbe (patch) | |
| tree | 6fe02110f5b5e74bc1543911ad9d28fb9b86d0cc /vp8/common/subpixel.h | |
| parent | f7044d4058fe22e81179727d87a7a425026538ee (diff) | |
| parent | 117fcb207e2e655cd334b6a8522af7d713b1fcee (diff) | |
| download | libvpx-9dccdc1f0884426d5c7340129660787b64812dbe.tar libvpx-9dccdc1f0884426d5c7340129660787b64812dbe.tar.gz libvpx-9dccdc1f0884426d5c7340129660787b64812dbe.tar.bz2 libvpx-9dccdc1f0884426d5c7340129660787b64812dbe.zip | |
Merge remote branch 'internal/upstream-experimental' into HEAD
Conflicts:
vp8/encoder/encodeframe.c
vp8/encoder/ethreading.c
Change-Id: I4becf6f101756923de6b98ca6a2132c3605c6ea5
Diffstat (limited to 'vp8/common/subpixel.h')
0 files changed, 0 insertions, 0 deletions