| commit | 44d35f7b257cc3e737a38eb9537d57c3e0479885 | [log] [tgz] |
|---|---|---|
| author | John Koleszar <jkoleszar@google.com> | Fri May 11 10:51:05 2012 -0700 |
| committer | John Koleszar <jkoleszar@google.com> | Fri May 11 10:51:05 2012 -0700 |
| tree | d6a93b58cecf28c982437d8f8f7694d944c1e980 | |
| parent | c7ca3808322e4ff6a26d2184137c1dfa94f97024 [diff] | |
| parent | 297dc90255cf9511bea26c1056aa5e118dae9028 [diff] |
Merge branch 'origin/eider' into master Conflicts: vp8/common/entropymode.c vp8/common/entropymode.h vp8/encoder/encodeframe.c vp8/vp8_cx_iface.c Change-Id: I708b0f30449b9502b382e47b745d56f5ed2ce265