tree 72c5d4a9539da06037e6cc652ee6998cd71a826b
parent 48b27135538bd74e81a01c25e1627a28e5389584
author Yaowu Xu <yaowu@google.com> 1454687457 -0800
committer Yaowu Xu <yaowu@google.com> 1454691881 -0800

Fix bad merge artifacts

Temporaly disable warning for unused function for vp10, needs clean
out the warnings before re-enable the flag for vp10.

Change-Id: I5636f8cd607423f6ea6963db9c2cbd688e30b495