summaryrefslogtreecommitdiffstats
path: root/tests/check
diff options
context:
space:
mode:
authorJan Schmidt <thaytan@noraisin.net>2009-06-05 19:32:26 +0100
committerJan Schmidt <thaytan@noraisin.net>2009-06-05 19:52:40 +0100
commit271788c9ae2a5126994d9dc45e777c3b15f3b802 (patch)
treed29025b95537c93bb5cd59883b4b8f113ed2da39 /tests/check
parent4d9a0e832cfc69c612e32902017390560024cd7e (diff)
downloadgst-plugins-bad-271788c9ae2a5126994d9dc45e777c3b15f3b802.tar.gz
gst-plugins-bad-271788c9ae2a5126994d9dc45e777c3b15f3b802.tar.bz2
gst-plugins-bad-271788c9ae2a5126994d9dc45e777c3b15f3b802.zip
Moved 'x264enc' from -bad to -ugly
Diffstat (limited to 'tests/check')
-rw-r--r--tests/check/Makefile.am11
-rw-r--r--tests/check/elements/.gitignore1
2 files changed, 1 insertions, 11 deletions
diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
index 940d1f4b..bc2d8fd0 100644
--- a/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@@ -63,17 +63,9 @@ else
check_timidity=
endif
-if USE_X264
-check_x264enc=elements/x264enc
-else
-check_x264enc=
-endif
-
-
VALGRIND_TO_FIX = \
elements/mpeg2enc \
- elements/mplex \
- elements/x264enc
+ elements/mplex
# valgrind testing
VALGRIND_TESTS_DISABLE = \
@@ -86,7 +78,6 @@ check_PROGRAMS = \
$(check_neon) \
$(check_ofa) \
$(check_timidity) \
- $(check_x264enc) \
elements/aacparse \
elements/amrparse \
elements/camerabin \
diff --git a/tests/check/elements/.gitignore b/tests/check/elements/.gitignore
index 091fb4e5..e97fc57f 100644
--- a/tests/check/elements/.gitignore
+++ b/tests/check/elements/.gitignore
@@ -26,5 +26,4 @@ videocrop
wavpackdec
wavpackenc
wavpackparse
-x264enc
y4menc