]> granicus.if.org Git - libvpx/commit
Merge "Resolve conflict between var-tx and super-tx" into nextgenv2
authorJingning Han <jingning@google.com>
Wed, 10 Feb 2016 18:54:21 +0000 (18:54 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 10 Feb 2016 18:54:21 +0000 (18:54 +0000)
commit3c8bd0d3de0d8493bddebfc9ddc9a76a783682e7
treeb4f0294127625179022a749ba03737ea0a5f0c79
parentba1bed68ec8b96b31cc06790055517f229e85281
parent4c6c82a2e856df8c3740b7d27c9b11d633716be2
Merge "Resolve conflict between var-tx and super-tx" into nextgenv2
vp10/encoder/encodeframe.c
vp10/encoder/rdopt.c