]> granicus.if.org Git - libvpx/commitdiff
Merge branch 'master' into nextgenv2
authorYaowu Xu <yaowu@google.com>
Fri, 22 Jan 2016 16:45:37 +0000 (08:45 -0800)
committerYaowu Xu <yaowu@google.com>
Fri, 22 Jan 2016 16:46:06 +0000 (08:46 -0800)
Change-Id: I0a82fa1cbe4ee7c7831d2d174f140a40d09a06c5

1  2 
vp10/vp10_cx_iface.c
vp9/encoder/vp9_aq_cyclicrefresh.c
vp9/encoder/vp9_encodeframe.c
vp9/encoder/vp9_rd.c

Simple merge
Simple merge
Simple merge
Simple merge