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

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

Simple merge
Simple merge