]> granicus.if.org Git - libvpx/commit
Fix automerge errors
authorYaowu Xu <yaowu@google.com>
Mon, 1 Feb 2016 20:29:36 +0000 (12:29 -0800)
committerYaowu Xu <yaowu@google.com>
Mon, 1 Feb 2016 22:03:49 +0000 (14:03 -0800)
commit9568a284ab9a300c702680ed7054c5d98c87794e
tree25f52e3c5780c0e1b132fc0497c2fd50571ddcf7
parent3ba144f81d72d210c373cc3c221fec55a5ca1d88
Fix automerge errors

Change-Id: I24d415bafe617eac894427088d7b2fbe0b7e04d7
vpx_dsp/intrapred.c