]> granicus.if.org Git - libvpx/commitdiff
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)
1  2 
vp10/encoder/encodeframe.c
vp10/encoder/rdopt.c

Simple merge
Simple merge