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

1  2 
vp8/encoder/encodeframe.c
vp8/encoder/rdopt.c

Simple merge
Simple merge