]> granicus.if.org Git - libvpx/commit
Merge remote branch 'origin/master' into experimental
authorJohann <johannkoenig@google.com>
Wed, 22 Jun 2011 11:45:17 +0000 (07:45 -0400)
committerJohann <johannkoenig@google.com>
Wed, 22 Jun 2011 11:45:17 +0000 (07:45 -0400)
commit786246ebf1fd4b875f33a8b0c35bab2a3df911b3
treefd2235c0be262280a561429bc2df343c79c3d646
parente18d7bc23095b89132007c64e38ce262dcb0a943
parent76495617e05d7192f887c688fa177fea77b9469b
Merge remote branch 'origin/master' into experimental

Conflicts:
vp8/encoder/rdopt.c
Use new constant (110) from 10ed60dc7

Change-Id: Ic7d8a45ccc8deeeb94a0ab1c58d5d052ef3c27e4
vp8/encoder/encodeframe.c
vp8/encoder/rdopt.c