]> granicus.if.org Git - libvpx/commit
Merge remote branch 'internal/upstream-experimental' into HEAD
authorJohn Koleszar <jkoleszar@google.com>
Mon, 7 Feb 2011 19:16:09 +0000 (14:16 -0500)
committerJohn Koleszar <jkoleszar@google.com>
Mon, 7 Feb 2011 19:16:09 +0000 (14:16 -0500)
commit2bb322380d6b4b046e7a9aeba2b1058684d46e30
tree1c21e0aa8411801bbad9e21e5fa0fefeac8326f5
parent9e36d442327c597e87fefda4913981f65aa6ae6c
parent318a14c637e3ec91d3ee9541a0ed527106947203
Merge remote branch 'internal/upstream-experimental' into HEAD

Conflicts:
vp8/encoder/encodeframe.c
vp8/encoder/ethreading.c
vp8/encoder/onyx_int.h

Change-Id: I1c562d2fe6e42c0d1d86f68c77c0e899066e02bd
vp8/encoder/encodeframe.c
vp8/encoder/ethreading.c
vp8/encoder/onyx_if.c
vp8/encoder/onyx_int.h