]> granicus.if.org Git - libvpx/commitdiff
Merge remote branch 'origin/master' into experimental
authorJohn Koleszar <jkoleszar@google.com>
Thu, 18 Aug 2011 04:05:12 +0000 (00:05 -0400)
committerJohn Koleszar <jkoleszar@google.com>
Thu, 18 Aug 2011 04:05:13 +0000 (00:05 -0400)
Change-Id: I3a4ec6e9fa7059cac52cfdcf9dfe6ef123629db4

1  2 
vp8/encoder/firstpass.c

Simple merge