| commit | 5f6db3591c64b9d53a5cf76f3afc5c28027d0feb | [log] [tgz] |
|---|---|---|
| author | John Koleszar <jkoleszar@google.com> | Wed Mar 23 00:24:25 2011 -0400 |
| committer | John Koleszar <jkoleszar@google.com> | Wed Mar 23 00:24:25 2011 -0400 |
| tree | d1507d4bff9f2308c8d42606c5345d435e9a6e24 | |
| parent | 4a1c3cf7d8bb38db15702f6fb772c9b94233c8e9 [diff] | |
| parent | edfc93aebac7674f26ed4c0389d97ae15e8b8c2b [diff] |
Merge remote branch 'origin/master' into experimental Conflicts: vp8/encoder/ratectrl.c vp8/encoder/rdopt.c Change-Id: I4cc58acb432662d2c47aceda1680e52982adbc06