]> granicus.if.org Git - libvpx/commitdiff
Merge "Fix merge defects" into nextgenv2
authorYaowu Xu <yaowu@google.com>
Fri, 23 Oct 2015 01:28:32 +0000 (01:28 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Fri, 23 Oct 2015 01:28:32 +0000 (01:28 +0000)
1  2 
vp10/encoder/rdopt.c

Simple merge