Merge remote branch 'origin/master' into experimental
authorJohann <johannkoenig@google.com>
Fri, 17 Jun 2011 18:56:27 +0000 (14:56 -0400)
committerJohann <johannkoenig@google.com>
Fri, 17 Jun 2011 18:56:27 +0000 (14:56 -0400)
commite18d7bc23095b89132007c64e38ce262dcb0a943
tree44e1121039142e6637b81b1f389292988dadb546
parent6c8205d37eb47c0757f752505ada46bc4079c003
parenta60fc419f50eefbef568ceecb93233471e894fa5
Merge remote branch 'origin/master' into experimental

Conflicts:
vp8/encoder/encodeframe.c
vp8/encoder/rdopt.c

Change-Id: I8bab720889ac652361abdedfe2cc91a89742cb30
vp8/encoder/encodeframe.c
vp8/encoder/firstpass.c
vp8/encoder/generic/csystemdependent.c
vp8/encoder/onyx_if.c
vp8/encoder/ratectrl.c
vp8/encoder/rdopt.c