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

Simple merge
Simple merge