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

1  2 
vp8/encoder/rdopt.c

Simple merge