| commit | ed04e82a04dc25e20cf639a9304f01ec2a200e19 | [log] [tgz] |
|---|---|---|
| author | Yaowu Xu <yaowu@google.com> | Mon Apr 18 12:22:56 2016 -0700 |
| committer | Yaowu Xu <yaowu@google.com> | Mon Apr 18 15:15:05 2016 -0700 |
| tree | 253c53daa96587f27294aff261c1c10652976c71 | |
| parent | d72560e10d6250173d5c4d3e6bf0e6ae68824fa2 [diff] | |
| parent | 2e0841931c76e3433242fa9ea4c6b1d361b88371 [diff] |
Merge branch 'master' into nextgenv2 Conflicts: vp10/common/scan.c vp9/common/vp9_pred_common.c vp9/decoder/vp9_decoder.c Change-Id: Id559d98ea676da15d60ed464ddb6c48d3eed1111