]> granicus.if.org Git - libvpx/commitdiff
Merge branch 'master' into nextgenv2
authorYaowu Xu <yaowu@google.com>
Wed, 28 Oct 2015 14:49:11 +0000 (07:49 -0700)
committerYaowu Xu <yaowu@google.com>
Wed, 28 Oct 2015 15:14:16 +0000 (08:14 -0700)
Change-Id: I63dc39d1ec9ad2e2454da6f5956dcd4367b87190

1  2 
vp10/common/entropy.h
vp9/encoder/vp9_aq_cyclicrefresh.c

Simple merge
Simple merge