]> granicus.if.org Git - libvpx/commit
Merge remote branch 'internal/upstream' into HEAD
authorJohn Koleszar <jkoleszar@google.com>
Wed, 23 Mar 2011 04:27:52 +0000 (00:27 -0400)
committerJohn Koleszar <jkoleszar@google.com>
Wed, 23 Mar 2011 04:27:52 +0000 (00:27 -0400)
commit51bcf621c174a5970a0f455572e3e3cf28cab5dd
tree356d9b44265a40db88fa62064115095dca5014e9
parent9f0082296817b7fe5101d3fca1e67b2524b41a73
parentedfc93aebac7674f26ed4c0389d97ae15e8b8c2b
Merge remote branch 'internal/upstream' into HEAD

Conflicts:
vp8/decoder/decodemv.c
vp8/decoder/onyxd_if.c
vp8/encoder/ratectrl.c
vp8/encoder/rdopt.c

Change-Id: Ia1c1c5e589f4200822d12378c7749ba62bd17ae2
16 files changed:
vp8/common/alloccommon.c
vp8/decoder/decodemv.c
vp8/decoder/decodframe.c
vp8/decoder/detokenize.c
vp8/decoder/onyxd_if.c
vp8/encoder/encodeframe.c
vp8/encoder/encodemb.c
vp8/encoder/ethreading.c
vp8/encoder/firstpass.c
vp8/encoder/generic/csystemdependent.c
vp8/encoder/onyx_if.c
vp8/encoder/psnr.c
vp8/encoder/ratectrl.c
vp8/encoder/rdopt.c
vp8/vp8_common.mk
vpxenc.c