| commit | 0367f32ea87e1b224768ca995000709fbf14e7eb | [log] [tgz] |
|---|---|---|
| author | Yaowu Xu <yaowu@google.com> | Mon Jan 11 10:27:35 2016 -0800 |
| committer | Debargha Mukherjee <debargha@google.com> | Wed Jan 13 13:18:06 2016 -0800 |
| tree | acb4dfeba6df34d7ff9aa5af2bfe9854eb1f9b46 | |
| parent | 387a10e3dcae530c83af31be95e8aef5064b0f5b [diff] | |
| parent | a0900fd0db5408da029fd3c71ec1f9d49ff98b3f [diff] |
Merge branch 'master' into nextgenv2 Manually resovled the following conflicts: vp10/common/blockd.h vp10/common/entropy.h vp10/common/entropymode.c vp10/common/entropymode.h vp10/common/enums.h vp10/common/thread_common.c vp10/decoder/decodeframe.c vp10/decoder/decodemv.c vp10/encoder/bitstream.c vp10/encoder/encodeframe.c vp10/encoder/rd.c vp10/encoder/rdopt.c Change-Id: I15d20ce5292b70f0c2b4ba55c1f1318181481596