]> granicus.if.org Git - libvpx/commitdiff
Merge branch 'master' into nextgenv2
authorYaowu Xu <yaowu@google.com>
Tue, 26 Jan 2016 13:00:05 +0000 (05:00 -0800)
committerYaowu Xu <yaowu@google.com>
Tue, 26 Jan 2016 13:00:05 +0000 (05:00 -0800)
1  2 
vp10/encoder/firstpass.c

Simple merge