]> granicus.if.org Git - libvpx/commit
Merge remote branch 'internal/upstream' into HEAD
authorJohn Koleszar <jkoleszar@google.com>
Fri, 13 May 2011 14:16:37 +0000 (10:16 -0400)
committerJohn Koleszar <jkoleszar@google.com>
Fri, 13 May 2011 14:16:37 +0000 (10:16 -0400)
commit72913435cb853def83bbbeec7cb69912d75ee368
tree77b53535700782209dd937341886d4071e0afe2d
parent25f10257f294263848080afcd1c53768fdb1072d
parent71a7501bcf6ada5068d102c03ae597023e986538
Merge remote branch 'internal/upstream' into HEAD

Conflicts:
vp8/common/blockd.h
vp8/decoder/decodemv.c

Change-Id: Ib97c226d5b33b1ac1675d9c96eac1986af4dd579
vp8/common/blockd.h
vp8/decoder/decodemv.c
vp8/encoder/bitstream.c
vp8/encoder/encodeframe.c
vp8/encoder/firstpass.c
vp8/encoder/onyx_if.c
vp8/encoder/rdopt.c