Merge "vp9_ethread: the tile-based multi-threaded encoder"
authorYunqing Wang <yunqingwang@google.com>
Fri, 5 Dec 2014 16:23:49 +0000 (08:23 -0800)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Fri, 5 Dec 2014 16:23:49 +0000 (08:23 -0800)
1  2 
vp9/encoder/vp9_encodeframe.c
vp9/encoder/vp9_encoder.c
vp9/vp9cx.mk

Simple merge
Simple merge
diff --cc vp9/vp9cx.mk
Simple merge