]> granicus.if.org Git - libvpx/commit
Merge remote branch 'internal/upstream' into HEAD
authorJohn Koleszar <jkoleszar@google.com>
Mon, 16 May 2011 13:09:36 +0000 (09:09 -0400)
committerJohn Koleszar <jkoleszar@google.com>
Mon, 16 May 2011 13:09:36 +0000 (09:09 -0400)
commita5074a8b8bdc06e59c9ffe26dc1870de5f8f13b0
tree5efd99881a0c546ccea435f1c20263fe41c50a1b
parentd75c175def023616380eb780841e338efe17648b
parenteafdc5e10acd025e3587ee56bfa90894eb52d5ba
Merge remote branch 'internal/upstream' into HEAD

Conflicts:
vp8/encoder/encodeframe.c
vp8/encoder/rdopt.c

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