projects / platform / upstream / libvpx.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 34a3628) | patch
Fix compiling errors due to git merge
authorJingning Han <jingning@google.com>
Tue, 25 Mar 2014 16:54:32 +0000 (09:54 -0700)
committerJingning Han <jingning@google.com>
Tue, 25 Mar 2014 17:25:16 +0000 (10:25 -0700)
commitc4e807ae2f60eed08811bc80d0763c489c8005c9
tree9465fd0cbb6a2004873868d68e47ad6b22413c71tree | snapshot
parent34a3628a459ed7489019252d3ca0f71746788a84commit | diff
Fix compiling errors due to git merge

There were a few conflicts between the new non-RD partition search
and recent clean-up patches, which were not caught by git control.
This commit fixed these issues.

Change-Id: Ieebefbd6c19d81d0d13e3c568877d5cce2ab7797
vp9/encoder/vp9_encodeframe.c diff | blob | history
Domain: Multimedia / Codec;