| commit | 786246ebf1fd4b875f33a8b0c35bab2a3df911b3 | [log] [tgz] |
|---|---|---|
| author | Johann <johannkoenig@google.com> | Wed Jun 22 07:45:17 2011 -0400 |
| committer | Johann <johannkoenig@google.com> | Wed Jun 22 07:45:17 2011 -0400 |
| tree | fd2235c0be262280a561429bc2df343c79c3d646 | |
| parent | e18d7bc23095b89132007c64e38ce262dcb0a943 [diff] | |
| parent | 76495617e05d7192f887c688fa177fea77b9469b [diff] |
Merge remote branch 'origin/master' into experimental Conflicts: vp8/encoder/rdopt.c Use new constant (110) from 10ed60dc7 Change-Id: Ic7d8a45ccc8deeeb94a0ab1c58d5d052ef3c27e4