]> granicus.if.org Git - libvpx/commit
Merge remote branch 'internal/upstream' into HEAD
authorJohn Koleszar <jkoleszar@google.com>
Wed, 15 Dec 2010 13:11:07 +0000 (08:11 -0500)
committerJohn Koleszar <jkoleszar@google.com>
Wed, 15 Dec 2010 13:11:07 +0000 (08:11 -0500)
commitf7224e14c86869857b257e36d45262235fc40ee1
treef81a93e2ec26749f5a90cfe3a6b25557fca43f28
parentf6dc56a1c986f23bbb45e1f2143daa4f3951e968
parent3ac73173a4c7e5be0a9846bc323699e7365c60ee
Merge remote branch 'internal/upstream' into HEAD

Conflicts:
vp8/common/entropy.c

Change-Id: Ic95302e327f80afd0261ac5bd9881f38296def47
vp8/common/entropy.c
vp8/common/entropy.h
vp8/encoder/ethreading.c
vp8/encoder/onyx_if.c