]> granicus.if.org Git - libvpx/commit
Merge remote branch 'internal/upstream-experimental' into HEAD
authorJohn Koleszar <jkoleszar@google.com>
Mon, 20 Jun 2011 13:07:43 +0000 (09:07 -0400)
committerJohn Koleszar <jkoleszar@google.com>
Mon, 20 Jun 2011 13:07:43 +0000 (09:07 -0400)
commitae74199ecf46086ec245506a570052e7310bdb24
treeafef884c26dac34a001211652dca77e5efa4c170
parentdeb2e9cf620087b4dc5b78423b6ff9bf8971c1bc
parente18d7bc23095b89132007c64e38ce262dcb0a943
Merge remote branch 'internal/upstream-experimental' into HEAD

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

Change-Id: I6ff3d92aa400bef10f6cc87f9da7ebaf6db8cc88
vp8/encoder/encodeframe.c