]> granicus.if.org Git - libvpx/commit
Fix a merge mistake
authorYaowu Xu <yaowu@google.com>
Fri, 22 Jan 2016 18:48:10 +0000 (10:48 -0800)
committerYaowu Xu <yaowu@google.com>
Fri, 22 Jan 2016 18:48:10 +0000 (10:48 -0800)
commit53c9ffd06fe9d248e4d61d90a00aeb9c73d4f236
treeabbb823ba672835a96f9290a93260fb01072f76b
parent11d3899c60dabdab014630b45d6f1ebbb8885710
Fix a merge mistake

Change-Id: I0769ca1abd42521a24078dc9ba7093ccb5e362ee
vp9/encoder/vp9_encodeframe.c