Merge remote branch 'origin/master' into experimental
authorJohn Koleszar <jkoleszar@google.com>
Sat, 5 Mar 2011 05:05:07 +0000 (00:05 -0500)
committerJohn Koleszar <jkoleszar@google.com>
Sat, 5 Mar 2011 05:05:07 +0000 (00:05 -0500)
commit01eb7c28742e907500279cff53184361a26e0847
tree410fa1302933ce402648d4a1d8cccb7130fe4f78
parent2c5638334ecb4fafc1ea9790ddf493d8d083ee4a
parent3fae3283e6037a0b20f5e32402ba8e50d7ef859e
Merge remote branch 'origin/master' into experimental

Change-Id: I70ac5a4f8388a7bfa058178c0ae53f6bdb0bb6e5
vp8/encoder/firstpass.c
vp8/encoder/onyx_if.c
vp8/vp8_cx_iface.c
vpx/vp8cx.h