]> granicus.if.org Git - libvpx/commit
Merge remote branch 'origin/master' into experimental
authorJohn Koleszar <jkoleszar@google.com>
Fri, 28 Jan 2011 13:33:52 +0000 (08:33 -0500)
committerJohn Koleszar <jkoleszar@google.com>
Fri, 28 Jan 2011 13:33:52 +0000 (08:33 -0500)
commita4c887da63131873a04b2af603efeb88b48b885e
tree7ab0a5aee02bafba742b7285d741578d860c9782
parent6c61e28e7a8fc6cca6808b8579195aa051fc03eb
parent73207a1d8bf1ecf6bc6fea03ae56109fe18e9574
Merge remote branch 'origin/master' into experimental

Conflicts:
vp8/encoder/rdopt.c

Change-Id: Ic17907df70fff45c9e766b5d0cbab0c5f1a1095f
vp8/encoder/firstpass.c
vp8/encoder/onyx_if.c
vp8/encoder/rdopt.c