From: John Koleszar <jkoleszar@google.com>
Date: Mon, 25 Jun 2012 19:52:02 +0000 (-0700)
Subject: Merge changes I94a061eb,If6910fe3
X-Git-Tag: v1.2.0~160
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d67acd870a469857c38f89427c06f4f6bfa46e2b;p=libvpx

Merge changes I94a061eb,If6910fe3

* changes:
  add auto keyframe unit test
  Add support for downloading test data
---

d67acd870a469857c38f89427c06f4f6bfa46e2b
diff --cc test/test.mk
index 11b05c96d,c68801db0..cdd213de7
--- a/test/test.mk
+++ b/test/test.mk
@@@ -3,9 -3,11 +3,12 @@@ LIBVPX_TEST_SRCS-yes += boolcoder_test.
  LIBVPX_TEST_SRCS-yes += config_test.cc
  LIBVPX_TEST_SRCS-yes += encode_test_driver.cc
  LIBVPX_TEST_SRCS-yes += encode_test_driver.h
+ LIBVPX_TEST_SRCS-yes += i420_video_source.h
  LIBVPX_TEST_SRCS-yes += idctllm_test.cc
  LIBVPX_TEST_SRCS-yes += keyframe_test.cc
 +LIBVPX_TEST_SRCS-yes += pp_filter_test.cc
  LIBVPX_TEST_SRCS-yes += resize_test.cc
  LIBVPX_TEST_SRCS-yes += test_libvpx.cc
  LIBVPX_TEST_SRCS-yes += video_source.h
+ 
 -LIBVPX_TEST_DATA-yes += hantro_collage_w352h288.yuv
++LIBVPX_TEST_DATA-yes += hantro_collage_w352h288.yuv