]> granicus.if.org Git - libvpx/commit
Merge branch 'master' into nextgenv2
authorYaowu Xu <yaowu@google.com>
Wed, 6 Jan 2016 16:36:18 +0000 (08:36 -0800)
committerYaowu Xu <yaowu@google.com>
Wed, 6 Jan 2016 16:36:18 +0000 (08:36 -0800)
commit55118ad0611683da48619065ebac4716438381b2
treee5b737c700fca66194389085c7d6ae42921b2ea2
parent3787b17439d00d3684646e97c18d231860dae8b9
parent2bd4f444092bf1902a1caca66e14e8e75189191d
Merge branch 'master' into nextgenv2

Conflicts:
vp10/decoder/decodeframe.c
vp10/encoder/bitstream.c

Change-Id: I743449f49b723d2ce357832619a28b53369d0547
configure
vp10/decoder/decodeframe.c
vp10/decoder/decodemv.c
vp10/encoder/bitstream.c
vp9/encoder/vp9_aq_cyclicrefresh.c