]> granicus.if.org Git - libvpx/commit
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)
commit94322a9f9b9f64874a40e18f75ac9f3bd8ac235e
tree6a239e3ce29ec4458584fd08e49983919d05aeb8
parentade60d4fe965687b8f6fe6e2a4b89955c5e87f95
parent732242ab3d00268782923e73e11e5a5fbd426bb4
Merge branch 'master' into nextgenv2

Change-Id: I0a82fa1cbe4ee7c7831d2d174f140a40d09a06c5
vp10/vp10_cx_iface.c
vp9/encoder/vp9_aq_cyclicrefresh.c
vp9/encoder/vp9_encodeframe.c
vp9/encoder/vp9_rd.c