]> granicus.if.org Git - libvpx/commit
Merge remote branch 'internal/upstream' into HEAD
authorJohn Koleszar <jkoleszar@google.com>
Tue, 26 Apr 2011 12:27:39 +0000 (08:27 -0400)
committerJohn Koleszar <jkoleszar@google.com>
Tue, 26 Apr 2011 12:27:39 +0000 (08:27 -0400)
commitbbc24a65c41b1a5a460967a2f5719ddb5489c1d5
tree1b95b4c9a6c2d21a0a0254945b5431ed7ddaabcb
parent308e31a3ef97fa7a5bf9a232b15587955e5ec89f
parentd5c46bdfc0d7bcc25e3ff549a0dc03d759050c19
Merge remote branch 'internal/upstream' into HEAD

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

Change-Id: Ic34b33577423031e277235ffa6bcaff7b252e5cb
vp8/common/alloccommon.c
vp8/common/blockd.h
vp8/common/onyxc_int.h
vp8/decoder/decodframe.c
vp8/encoder/encodeframe.c
vp8/encoder/onyx_if.c
vp8/encoder/onyx_int.h
vp8/encoder/ratectrl.c
vp8/encoder/rdopt.c
vp8/vp8_cx_iface.c
vpxenc.c