Merge remote branch 'origin/master' into experimental
authorJohn Koleszar <jkoleszar@google.com>
Thu, 10 Feb 2011 05:05:09 +0000 (00:05 -0500)
committerJohn Koleszar <jkoleszar@google.com>
Thu, 10 Feb 2011 05:05:10 +0000 (00:05 -0500)
commit96ddc5c26e354d96a73cd0f3d16f2bde3ea8b0db
tree05358c3c6813d8db292624862b0c69db9730f13b
parent6e6b46d97295c8227717e294f07de7283303369a
parentfffa2a61d72883019c7c09466db7e947cb7de34d
Merge remote branch 'origin/master' into experimental

Change-Id: Ie85d40c44bb23d56a519010356b2856c02fb4c05
vp8/decoder/onyxd_int.h
vp8/encoder/encodeframe.c
vp8/encoder/onyx_if.c
vp8/encoder/rdopt.c
vp8/vp8_cx_iface.c