]> granicus.if.org Git - libvpx/commit
Merge branch 'master' into nextgenv2
authorYaowu Xu <yaowu@google.com>
Wed, 16 Dec 2015 16:03:59 +0000 (08:03 -0800)
committerYaowu Xu <yaowu@google.com>
Wed, 16 Dec 2015 17:00:57 +0000 (09:00 -0800)
commitdab7515aa4860e201bde9e2c8406c4e15819b65b
tree7e6d131d140bf20aacff47d93418c5b1422be87e
parentd6695b8a0e109b62127d006b8f7474b26c7490c0
parenteace551c8738b878d3649f70d82dd13ca3a96a29
Merge branch 'master' into nextgenv2

With a few manual fixes of merge conflicts.

Change-Id: I0dd65ff90f9fa8606e5563f528659e2607b12376
vp10/decoder/decodeframe.c
vp10/encoder/bitstream.c
vp10/encoder/encoder.c
vp10/encoder/rdopt.c
vp9/encoder/vp9_encodeframe.c