Merge branch 'vp9-preview' of review:webm/libvpx
authorJohn Koleszar <jkoleszar@google.com>
Fri, 21 Dec 2012 23:20:41 +0000 (15:20 -0800)
committerJohn Koleszar <jkoleszar@google.com>
Thu, 27 Dec 2012 17:37:19 +0000 (09:37 -0800)
commit16810c10c1fbe3bb55b3da28a5bb37fe1c184af9
tree2b5ddbabd155216da43baf137eee93b6fba7eb60
parentb9ce43029298182668d4dcb0e0814189e4a63c2a
parent5ebe94f9f148693a34bc861ef97a7fff6fc38251
Merge branch 'vp9-preview' of review:webm/libvpx

Merge the vp9-preview branch into master.

Change-Id: If700b9054676f24bed9deb59050af546c1ca5296
20 files changed:
build/make/Android.mk
build/make/configure.sh
configure
libs.mk
test/idctllm_test.cc
test/intrapred_test.cc
test/pp_filter_test.cc
test/sad_test.cc
test/sixtap_predict_test.cc
test/subtract_test.cc
test/test.mk
vp8/decoder/threading.c
vp8/encoder/denoising.c
vp8/encoder/firstpass.c
vp8/encoder/onyx_if.c
vp8/encoder/rdopt.c
vp8/vp8cx.mk
vp8/vp8dx.mk
vpx/vpx_codec.h
vpxenc.c