]> granicus.if.org Git - libvpx/commit
Merge branch 'master' into nextgenv2
authorYaowu Xu <yaowu@google.com>
Fri, 18 Dec 2015 13:00:05 +0000 (05:00 -0800)
committerYaowu Xu <yaowu@google.com>
Fri, 18 Dec 2015 13:00:05 +0000 (05:00 -0800)
commit733010800910722a27c5d2af7e3ca117a7957372
treebe0d8abc19c2acf2dab4397b62d313a95d325bae
parentec36a2b061bd4acacc75f15c7d8eadfa8f6cf0fd
parent8f8a3b6a7842e82d1bdf61538a0f05c7044060ab
Merge branch 'master' into nextgenv2
vp10/decoder/decodeframe.c
vp9/encoder/vp9_encodeframe.c