| commit | c810740c36b71dd1357259eae35682f7711d31e0 | [log] [tgz] |
|---|---|---|
| author | Yaowu Xu <yaowu@google.com> | Mon Mar 28 10:26:27 2016 -0700 |
| committer | Yaowu Xu <yaowu@google.com> | Mon Mar 28 17:44:28 2016 -0700 |
| tree | 4c397144510ab0909f53777abacea3b5b92c09ad | |
| parent | 72e29c3a739da63b3fe4d71a4abb3bbe9c689b0a [diff] | |
| parent | 86fb8130bf4a1993c913d7b91a4f6358f1b410b6 [diff] |
Merge branch 'masterbase' into nextgenv2 Conflicts: vp9/encoder/vp9_encoder.c vpx_dsp/x86/convolve.h Change-Id: I60c3532936bedd796a75dfe78245a95ec21e2e55