]> granicus.if.org Git - libvpx/commit
Merge remote branch 'origin/master' into experimental
authorJohn Koleszar <jkoleszar@google.com>
Tue, 26 Apr 2011 12:28:51 +0000 (08:28 -0400)
committerJohn Koleszar <jkoleszar@google.com>
Tue, 26 Apr 2011 12:28:51 +0000 (08:28 -0400)
commit0a77e59847967f76f022e3d8eacef302f4a16038
tree226aad9ddfa0d2d7bba975a6b009ae83b06b9f60
parent5227798c570af08d08dd6fdd7a3e96d5dc96977b
parentd5c46bdfc0d7bcc25e3ff549a0dc03d759050c19
Merge remote branch 'origin/master' into experimental

Conflicts:
vp8/common/alloccommon.c
vp8/encoder/rdopt.c

Change-Id: I142167d31d1b9cffe143774f6915bca463df67f0
vp8/common/alloccommon.c
vp8/common/onyxc_int.h
vp8/encoder/encodeframe.c
vp8/encoder/onyx_if.c
vp8/encoder/ratectrl.c
vp8/encoder/rdopt.c
vp8/vp8_cx_iface.c