summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim@centricular.com>2015-06-21 11:51:38 +0100
committerTim-Philipp Müller <tim@centricular.com>2015-06-21 11:51:38 +0100
commite7512329cac59b60bf911639320c746d637f9f90 (patch)
treecc7826fada8440d702c50fde5b659936bbcfb7a6
parent82be4ad39537c8328dc9d458e4ecbde8c68e3770 (diff)
examples: move vp8 parser test to codecparser example directory
-rw-r--r--.gitignore3
-rw-r--r--tests/examples/codecparsers/Makefile.am9
-rw-r--r--tests/examples/codecparsers/parse-vp8.c (renamed from tests/icles/vp8parser-test.c)0
-rw-r--r--tests/icles/.gitignore1
-rw-r--r--tests/icles/Makefile.am7
5 files changed, 12 insertions, 8 deletions
diff --git a/.gitignore b/.gitignore
index 90b053792..e0c207fcd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -53,6 +53,9 @@ gst*orc.h
/tests/check/orc
/tests/examples/codecparsers/parse-jpeg
+/tests/examples/codecparsers/parse-vp8
+/tests/examples/gtk/gtkglsink
+/tests/examples/gtk/gtksink
/tests/examples/shapewipe/shapewipe-example
/tests/examples/jack/jack_client
/tests/examples/opencv/gstmotioncells_dynamic_test
diff --git a/tests/examples/codecparsers/Makefile.am b/tests/examples/codecparsers/Makefile.am
index 1a3b87ce5..6fd8c99f4 100644
--- a/tests/examples/codecparsers/Makefile.am
+++ b/tests/examples/codecparsers/Makefile.am
@@ -1,7 +1,14 @@
-noinst_PROGRAMS = parse-jpeg
+noinst_PROGRAMS = parse-jpeg parse-vp8
parse_jpeg_SOURCES = parse-jpeg.c
parse_jpeg_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_CFLAGS)
parse_jpeg_LDFLAGS = $(GST_LIBS)
parse_jpeg_LDADD = \
$(top_builddir)/gst-libs/gst/codecparsers/libgstcodecparsers-$(GST_API_VERSION).la
+
+parse_vp8_SOURCES = parse-vp8.c
+parse_vp8_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_CFLAGS)
+parse_vp8_LDFLAGS = $(GST_LIBS)
+parse_vp8_LDADD = \
+ $(top_builddir)/gst-libs/gst/codecparsers/libgstcodecparsers-$(GST_API_VERSION).la
+
diff --git a/tests/icles/vp8parser-test.c b/tests/examples/codecparsers/parse-vp8.c
index a843caa61..a843caa61 100644
--- a/tests/icles/vp8parser-test.c
+++ b/tests/examples/codecparsers/parse-vp8.c
diff --git a/tests/icles/.gitignore b/tests/icles/.gitignore
index ac00a25f0..84cfb633b 100644
--- a/tests/icles/.gitignore
+++ b/tests/icles/.gitignore
@@ -1,4 +1,3 @@
equalizer-test
metadata_editor
pitch-test
-vp8parser-test
diff --git a/tests/icles/Makefile.am b/tests/icles/Makefile.am
index 9cb389d6b..996c5cc5c 100644
--- a/tests/icles/Makefile.am
+++ b/tests/icles/Makefile.am
@@ -11,11 +11,6 @@ else
GST_SOUNDTOUCH_TESTS =
endif
-GST_VP8PARSER_TESTS = vp8parser-test
-vp8parser_test_SOURCES = vp8parser-test.c
-vp8parser_test_CFLAGS = -I$(top_srcdir)/gst-libs $(GST_CFLAGS)
-vp8parser_test_LDADD = $(top_builddir)/gst-libs/gst/codecparsers/libgstcodecparsers-@GST_API_VERSION@.la $(GST_LIBS)
-
# needs porting
#if HAVE_GTK
#
@@ -30,5 +25,5 @@ vp8parser_test_LDADD = $(top_builddir)/gst-libs/gst/codecparsers/libgstcodecp
GST_METADATA_TESTS =
#endif
-noinst_PROGRAMS = $(GST_SOUNDTOUCH_TESTS) $(GST_METADATA_TESTS) $(GST_VP8PARSER_TESTS)
+noinst_PROGRAMS = $(GST_SOUNDTOUCH_TESTS) $(GST_METADATA_TESTS)