]> granicus.if.org Git - libvpx/commit
Merge branch 'masterbase' into nextgenv2
authorYaowu Xu <yaowu@google.com>
Mon, 28 Mar 2016 17:26:27 +0000 (10:26 -0700)
committerYaowu Xu <yaowu@google.com>
Tue, 29 Mar 2016 00:44:28 +0000 (17:44 -0700)
commitc810740c36b71dd1357259eae35682f7711d31e0
tree4c397144510ab0909f53777abacea3b5b92c09ad
parent72e29c3a739da63b3fe4d71a4abb3bbe9c689b0a
parent86fb8130bf4a1993c913d7b91a4f6358f1b410b6
Merge branch 'masterbase' into nextgenv2

Conflicts:
vp9/encoder/vp9_encoder.c
vpx_dsp/x86/convolve.h

Change-Id: I60c3532936bedd796a75dfe78245a95ec21e2e55
13 files changed:
test/test.mk
vp10/common/mvref_common.h
vp10/encoder/encoder.c
vp8/encoder/onyx_if.c
vp8/encoder/onyx_int.h
vp9/encoder/vp9_aq_cyclicrefresh.c
vp9/encoder/vp9_encodeframe.c
vp9/encoder/vp9_encoder.c
vp9/encoder/vp9_encoder.h
vpx_dsp/vpx_dsp.mk
vpx_dsp/vpx_dsp_rtcd_defs.pl
vpx_dsp/x86/convolve.h
vpxenc.c