]> granicus.if.org Git - libvpx/commit
Merge remote branch 'internal/upstream' into HEAD
authorJohn Koleszar <jkoleszar@google.com>
Fri, 17 Jun 2011 19:36:43 +0000 (15:36 -0400)
committerJohn Koleszar <jkoleszar@google.com>
Fri, 17 Jun 2011 19:36:43 +0000 (15:36 -0400)
commitdeb2e9cf620087b4dc5b78423b6ff9bf8971c1bc
tree592d5eeb0cac290da19d6e660135a0f41dfd1dc3
parentcefb915ab62a7cd91b347cc22449b2eb9b8c1df9
parenta60fc419f50eefbef568ceecb93233471e894fa5
Merge remote branch 'internal/upstream' into HEAD

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

Change-Id: I183fd3ce9e94617ec888c9f891055b9f1f8ca6c5
12 files changed:
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
vp8/encoder/firstpass.c
vp8/encoder/generic/csystemdependent.c
vp8/encoder/onyx_if.c
vp8/encoder/onyx_int.h
vp8/encoder/ratectrl.c
vp8/encoder/rdopt.c