]> granicus.if.org Git - libvpx/commit
Merge remote branch 'internal/upstream' into HEAD
authorJohn Koleszar <jkoleszar@google.com>
Mon, 14 Mar 2011 12:52:54 +0000 (08:52 -0400)
committerJohn Koleszar <jkoleszar@google.com>
Mon, 14 Mar 2011 12:53:02 +0000 (08:53 -0400)
commitba83622a00b982297f71dccb25ecb9a8047afa4e
treee21963481583fce9c1363ff8116f58ce7e2c90e5
parent601781138241d506bed2c4cdb285a51714dce380
parent3788b3564c587983a10d7131b35c0d9c39540666
Merge remote branch 'internal/upstream' into HEAD

Conflicts:
vp8/encoder/onyx_if.c

Change-Id: Ieef9a58a2effdc68cf52bc5f14d90c31a1dbc13a
vp8/common/generic/systemdependent.c
vp8/decoder/decodframe.c
vp8/encoder/encodeframe.c
vp8/encoder/ethreading.c
vp8/encoder/firstpass.c
vp8/encoder/generic/csystemdependent.c
vp8/encoder/onyx_if.c
vp8/encoder/onyx_int.h
vp8/encoder/ratectrl.c
vp8/encoder/rdopt.c