| commit | 69f49300410a6815494a5361f49fca82bd3f337c | [log] [tgz] |
|---|---|---|
| author | Yaowu Xu <yaowu@google.com> | Mon Dec 07 09:58:46 2015 -0800 |
| committer | Yaowu Xu <yaowu@google.com> | Mon Dec 07 11:37:14 2015 -0800 |
| tree | 8e8492e56c47f085ea6eb467697440013237c73f | |
| parent | f5bed806fb502c7d9b837f663c418ef1f23cdf6c [diff] | |
| parent | 9d85ce8e0cc588629650690a5fa0ed559ed77d30 [diff] |
Merge branch 'master' into nextgenv2 Conflicts: vp10/common/blockd.h vp10/common/entropymode.h vp10/common/reconintra.c vp10/decoder/decodemv.c vp10/encoder/bitstream.c vp10/encoder/encoder.h vp10/encoder/rd.c vp10/encoder/rdopt.c vp10/encoder/tokenize.h Change-Id: Ic4891839b6f0474026d6d69821e38edec9632df1