]> granicus.if.org Git - libvpx/commitdiff
Merge remote branch 'origin/master' into experimental
authorJohn Koleszar <jkoleszar@google.com>
Tue, 8 Feb 2011 05:05:10 +0000 (00:05 -0500)
committerJohn Koleszar <jkoleszar@google.com>
Tue, 8 Feb 2011 05:05:11 +0000 (00:05 -0500)
Change-Id: I7897261eb2956f778f9f9885ce2005b1e134b28f

1  2 
vp8/decoder/generic/dsystemdependent.c
vp8/decoder/onyxd_int.h
vp8/encoder/rdopt.c

Simple merge
Simple merge