]> granicus.if.org Git - libvpx/commit
Merge remote branch 'internal/upstream-experimental' into HEAD
authorJohn Koleszar <jkoleszar@google.com>
Thu, 30 Jun 2011 12:46:49 +0000 (08:46 -0400)
committerJohn Koleszar <jkoleszar@google.com>
Thu, 30 Jun 2011 12:46:49 +0000 (08:46 -0400)
commit9dfd0060176ad0d6f5beb465ae75a67584169acd
tree8bbbefd2c75c36c26721f20b988ab86e0f1aa80e
parentf86e14d8dc0e063ba2623d2b9a71ec5dac1ba839
parent6251e9e5cee546c3b20cdc3498d43e0204db97b9
Merge remote branch 'internal/upstream-experimental' into HEAD

Conflicts:
vp8/encoder/bitstream.c

Change-Id: I44c00f98dcb99eb728ce4f5256aefb135a711a74
vp8/decoder/decodframe.c
vp8/decoder/onyxd_if.c
vp8/decoder/onyxd_int.h
vp8/encoder/bitstream.c
vp8/encoder/onyx_if.c
vp8/encoder/onyx_int.h
vp8/encoder/rdopt.c
vp8/vp8_common.mk
vpxenc.c