]> granicus.if.org Git - libvpx/commitdiff
Merge remote branch 'origin/master' into experimental
authorJohn Koleszar <jkoleszar@google.com>
Sat, 7 May 2011 04:05:11 +0000 (00:05 -0400)
committerJohn Koleszar <jkoleszar@google.com>
Sat, 7 May 2011 04:05:11 +0000 (00:05 -0400)
Change-Id: I22f61430b52348b32078253d5ef38e68e7f91939

1  2 
vp8/encoder/onyx_if.c
vp8/encoder/ratectrl.c

Simple merge
Simple merge