]> granicus.if.org Git - libvpx/commit
Resolve merge issues with --enable-pvq
authorYaowu Xu <yaowu@google.com>
Mon, 7 Nov 2016 18:24:14 +0000 (10:24 -0800)
committerYaowu Xu <yaowu@google.com>
Mon, 7 Nov 2016 18:35:55 +0000 (10:35 -0800)
commitd6ea71cf73646f8355f58fa2fc08edc72ff87931
treec0a044298e009aef33cc7618fa96b73cb5f20e04
parent00a0e010f70c06e6b1f7473aee8e1034370db09e
Resolve merge issues with --enable-pvq

This commit resolves some compiling issues due to merge.

Change-Id: I0eef8aa36c404e185e0b0004948a49307c360d3e
av1/decoder/decodeframe.c
av1/encoder/context_tree.c
av1/encoder/encodeframe.c
av1/encoder/encodemb.c
av1/encoder/encodemb.h
av1/encoder/firstpass.c
av1/encoder/pvq_encoder.c
av1/encoder/rdopt.c
av1/encoder/tokenize.c