| commit | 7c514e2dfdb514b3efbf25d505232e9a4152689c | [log] [tgz] |
|---|---|---|
| author | Yaowu Xu <yaowu@google.com> | Mon Sep 28 15:55:46 2015 -0700 |
| committer | Yaowu Xu <yaowu@google.com> | Tue Sep 29 16:17:32 2015 -0700 |
| tree | 8488eba50ef9525d16405ab7cad8f638f5a845da | |
| parent | 07154b021617794bf37eed3e020ca39035155587 [diff] |
Merged branch 'master' into nextgenv2
Resolved Conflicts in the following files:
configure
vp10/common/idct.c
vp10/encoder/dct.c
vp10/encoder/encodemb.c
vp10/encoder/rdopt.c
Change-Id: I4cb3986b0b80de65c722ca29d53a0a57f5a94316