]> granicus.if.org Git - libvpx/commitdiff
Merge branch 'master' into nextgenv2
authorYaowu Xu <yaowu@google.com>
Fri, 30 Oct 2015 12:00:05 +0000 (05:00 -0700)
committerYaowu Xu <yaowu@google.com>
Fri, 30 Oct 2015 12:00:05 +0000 (05:00 -0700)
1  2 
vp10/common/entropy.h
vp10/encoder/subexp.c

Simple merge
Simple merge