ref: 2258e28f7e6e41fe6533c53d3363ed06e36cfeb7
parent: bc8b0ada3ad3e6311f34544561b07d3f17f7e203
parent: 675ec943db9a8f6df005c3824431142ccaacb2c2
author: Frank Galligan <[email protected]>
date: Fri Dec 19 05:31:30 EST 2014
Merge "Fix including test file twice."
--- a/test/test-data.mk
+++ b/test/test-data.mk
@@ -715,7 +715,9 @@
ifeq ($(CONFIG_DECODE_PERF_TESTS),yes)
# NewEncode Test
+ifneq ($(CONFIG_VP9_ENCODER),yes)
LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += niklas_1280_720_30.yuv
+endif
# BBB VP9 streams
LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp90-2-bbb_426x240_tile_1x1_180kbps.webm
LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp90-2-bbb_640x360_tile_1x2_337kbps.webm
@@ -745,9 +747,6 @@
LIBVPX_TEST_DATA-$(CONFIG_VP9_ENCODER) += kirland_640_480_30.yuv
LIBVPX_TEST_DATA-$(CONFIG_VP9_ENCODER) += macmarcomoving_640_480_30.yuv
LIBVPX_TEST_DATA-$(CONFIG_VP9_ENCODER) += macmarcostationary_640_480_30.yuv
-ifneq ($(CONFIG_DECODE_PERF_TESTS),yes)
-LIBVPX_TEST_DATA-$(CONFIG_VP9_ENCODER) += niklas_1280_720_30.yuv
-endif
LIBVPX_TEST_DATA-$(CONFIG_VP9_ENCODER) += niklas_640_480_30.yuv
LIBVPX_TEST_DATA-$(CONFIG_VP9_ENCODER) += tacomanarrows_640_480_30.yuv
LIBVPX_TEST_DATA-$(CONFIG_VP9_ENCODER) += tacomasmallcameramovement_640_480_30.yuv