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

1  2 
vp8/encoder/encodeframe.c

Simple merge