]> granicus.if.org Git - libvpx/commit
Merge remote branch 'internal/upstream-experimental' into HEAD
authorJohn Koleszar <jkoleszar@google.com>
Thu, 26 May 2011 15:44:18 +0000 (11:44 -0400)
committerJohn Koleszar <jkoleszar@google.com>
Thu, 26 May 2011 15:44:36 +0000 (11:44 -0400)
commit9dccdc1f0884426d5c7340129660787b64812dbe
tree6fe02110f5b5e74bc1543911ad9d28fb9b86d0cc
parentf7044d4058fe22e81179727d87a7a425026538ee
parent117fcb207e2e655cd334b6a8522af7d713b1fcee
Merge remote branch 'internal/upstream-experimental' into HEAD

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

Change-Id: I4becf6f101756923de6b98ca6a2132c3605c6ea5
vp8/common/blockd.h
vp8/decoder/decodemv.c
vp8/decoder/decodframe.c
vp8/decoder/onyxd_if.c
vp8/encoder/bitstream.c
vp8/encoder/encodeframe.c