]> granicus.if.org Git - libvpx/commit
Merge branch 'masterbase' into nextgenv2
authorYaowu Xu <yaowu@google.com>
Fri, 12 Feb 2016 17:19:30 +0000 (09:19 -0800)
committerYaowu Xu <yaowu@google.com>
Fri, 12 Feb 2016 17:19:30 +0000 (09:19 -0800)
commit18b6e9a36f17cfe7774f5329c7cf83e40f9d2cea
tree8adb78cb02a0cf15ec138fcef60cc48a9ecf0f01
parent13efa8a0894a3d49c3b2587ace6c1fe9425c4d3f
parent34d12d116051e4e9c877b601f9add06ad725f6e3
Merge branch 'masterbase' into nextgenv2

Conflicts:
vp10/encoder/rdopt.c

Change-Id: If720e7f9810378d24bf9fd51a95fd29c3bc5d774
vp9/encoder/vp9_aq_cyclicrefresh.c
vp9/encoder/vp9_encoder.c
vp9/encoder/vp9_encoder.h
vp9/encoder/vp9_rd.c
vpx_dsp/intrapred.c