Imported Upstream version 0.11.94upstream/0.11.94

5 files changed, 4 insertions, 89 deletions

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 8977ac4..a253476 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -260,8 +260,6 @@ PACKAGE_VERSION_RELEASE = @PACKAGE_VERSION_RELEASE@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PLUGINDIR = @PLUGINDIR@
-POSTPROC_CFLAGS = @POSTPROC_CFLAGS@
-POSTPROC_LIBS = @POSTPROC_LIBS@
 PROFILE_CFLAGS = @PROFILE_CFLAGS@
 PYTHON = @PYTHON@
 PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
index e6ca0e3..4af5db3 100644
--- a/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@@ -16,16 +16,11 @@ CLEANFILES = core.* test-registry.xml
 
 clean-local: clean-local-check
 
-if !GST_LIBAV_ENABLE_LGPL
-postproc_tests = elements/postproc
-endif
-
 check_PROGRAMS = \
 	generic/plugin-test \
 	generic/libavcodec-locking \
 	elements/avdec_adpcm \
-	elements/avdemux_ape \
-	$(postproc_tests)
+	elements/avdemux_ape
 
 VALGRIND_TO_FIX = \
 	generic/plugin-test \
diff --git a/tests/check/Makefile.in b/tests/check/Makefile.in
index 95f977c..7a77fe4 100644
--- a/tests/check/Makefile.in
+++ b/tests/check/Makefile.in
@@ -56,8 +56,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(top_srcdir)/common/check.mak
 check_PROGRAMS = generic/plugin-test$(EXEEXT) \
 	generic/libavcodec-locking$(EXEEXT) \
-	elements/avdec_adpcm$(EXEEXT) elements/avdemux_ape$(EXEEXT) \
-	$(am__EXEEXT_1)
+	elements/avdec_adpcm$(EXEEXT) elements/avdemux_ape$(EXEEXT)
 noinst_PROGRAMS =
 subdir = tests/check
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -89,8 +88,6 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-@GST_LIBAV_ENABLE_LGPL_FALSE@am__EXEEXT_1 =  \
-@GST_LIBAV_ENABLE_LGPL_FALSE@	elements/postproc$(EXEEXT)
 PROGRAMS = $(noinst_PROGRAMS)
 elements_avdec_adpcm_SOURCES = elements/avdec_adpcm.c
 elements_avdec_adpcm_OBJECTS = avdec_adpcm.$(OBJEXT)
@@ -105,10 +102,6 @@ elements_avdemux_ape_SOURCES = elements/avdemux_ape.c
 elements_avdemux_ape_OBJECTS = avdemux_ape.$(OBJEXT)
 elements_avdemux_ape_LDADD = $(LDADD)
 elements_avdemux_ape_DEPENDENCIES = $(am__DEPENDENCIES_1)
-elements_postproc_SOURCES = elements/postproc.c
-elements_postproc_OBJECTS = postproc.$(OBJEXT)
-elements_postproc_LDADD = $(LDADD)
-elements_postproc_DEPENDENCIES = $(am__DEPENDENCIES_1)
 generic_libavcodec_locking_SOURCES = generic/libavcodec-locking.c
 generic_libavcodec_locking_OBJECTS = libavcodec-locking.$(OBJEXT)
 generic_libavcodec_locking_LDADD = $(LDADD)
@@ -144,11 +137,9 @@ AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = elements/avdec_adpcm.c elements/avdemux_ape.c \
-	elements/postproc.c generic/libavcodec-locking.c \
-	generic/plugin-test.c
+	generic/libavcodec-locking.c generic/plugin-test.c
 DIST_SOURCES = elements/avdec_adpcm.c elements/avdemux_ape.c \
-	elements/postproc.c generic/libavcodec-locking.c \
-	generic/plugin-test.c
+	generic/libavcodec-locking.c generic/plugin-test.c
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -284,8 +275,6 @@ PACKAGE_VERSION_RELEASE = @PACKAGE_VERSION_RELEASE@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PLUGINDIR = @PLUGINDIR@
-POSTPROC_CFLAGS = @POSTPROC_CFLAGS@
-POSTPROC_LIBS = @POSTPROC_LIBS@
 PROFILE_CFLAGS = @PROFILE_CFLAGS@
 PYTHON = @PYTHON@
 PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
@@ -386,7 +375,6 @@ TESTS_ENVIRONMENT = \
 
 # ths core dumps of some machines have PIDs appended
 CLEANFILES = core.* test-registry.xml
-@GST_LIBAV_ENABLE_LGPL_FALSE@postproc_tests = elements/postproc
 VALGRIND_TO_FIX = \
 	generic/plugin-test \
 	generic/libavcodec-locking \
@@ -465,9 +453,6 @@ elements/avdec_adpcm$(EXEEXT): $(elements_avdec_adpcm_OBJECTS) $(elements_avdec_
 elements/avdemux_ape$(EXEEXT): $(elements_avdemux_ape_OBJECTS) $(elements_avdemux_ape_DEPENDENCIES) $(EXTRA_elements_avdemux_ape_DEPENDENCIES) elements/$(am__dirstamp)
 	@rm -f elements/avdemux_ape$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(elements_avdemux_ape_OBJECTS) $(elements_avdemux_ape_LDADD) $(LIBS)
-elements/postproc$(EXEEXT): $(elements_postproc_OBJECTS) $(elements_postproc_DEPENDENCIES) $(EXTRA_elements_postproc_DEPENDENCIES) elements/$(am__dirstamp)
-	@rm -f elements/postproc$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(elements_postproc_OBJECTS) $(elements_postproc_LDADD) $(LIBS)
 generic/$(am__dirstamp):
 	@$(MKDIR_P) generic
 	@: > generic/$(am__dirstamp)
@@ -488,7 +473,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/avdemux_ape.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libavcodec-locking.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plugin-test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/postproc.Po@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -539,20 +523,6 @@ avdemux_ape.obj: elements/avdemux_ape.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o avdemux_ape.obj `if test -f 'elements/avdemux_ape.c'; then $(CYGPATH_W) 'elements/avdemux_ape.c'; else $(CYGPATH_W) '$(srcdir)/elements/avdemux_ape.c'; fi`
 
-postproc.o: elements/postproc.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT postproc.o -MD -MP -MF $(DEPDIR)/postproc.Tpo -c -o postproc.o `test -f 'elements/postproc.c' || echo '$(srcdir)/'`elements/postproc.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/postproc.Tpo $(DEPDIR)/postproc.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='elements/postproc.c' object='postproc.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o postproc.o `test -f 'elements/postproc.c' || echo '$(srcdir)/'`elements/postproc.c
-
-postproc.obj: elements/postproc.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT postproc.obj -MD -MP -MF $(DEPDIR)/postproc.Tpo -c -o postproc.obj `if test -f 'elements/postproc.c'; then $(CYGPATH_W) 'elements/postproc.c'; else $(CYGPATH_W) '$(srcdir)/elements/postproc.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/postproc.Tpo $(DEPDIR)/postproc.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='elements/postproc.c' object='postproc.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o postproc.obj `if test -f 'elements/postproc.c'; then $(CYGPATH_W) 'elements/postproc.c'; else $(CYGPATH_W) '$(srcdir)/elements/postproc.c'; fi`
-
 libavcodec-locking.o: generic/libavcodec-locking.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libavcodec-locking.o -MD -MP -MF $(DEPDIR)/libavcodec-locking.Tpo -c -o libavcodec-locking.o `test -f 'generic/libavcodec-locking.c' || echo '$(srcdir)/'`generic/libavcodec-locking.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libavcodec-locking.Tpo $(DEPDIR)/libavcodec-locking.Po
diff --git a/tests/check/elements/postproc.c b/tests/check/elements/postproc.c
deleted file mode 100644
index 1dd20c2..0000000
--- a/tests/check/elements/postproc.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* GStreamer unit tests for postproc
- * Copyright (C) 2011 Collabora Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <gst/check/gstcheck.h>
-#include <gst/gst.h>
-
-GST_START_TEST (test_postproc_default)
-{
-  GstElement *pp;
-
-  pp = gst_element_factory_make ("postproc_default", NULL);
-  fail_unless (pp != NULL, "Failed to create postproc_default!");
-  gst_object_unref (pp);
-}
-
-GST_END_TEST;
-
-static Suite *
-postproc_suite (void)
-{
-  Suite *s = suite_create ("postproc");
-  TCase *tc_chain = tcase_create ("general");
-
-  suite_add_tcase (s, tc_chain);
-  tcase_add_test (tc_chain, test_postproc_default);
-
-  return s;
-}
-
-GST_CHECK_MAIN (postproc)
diff --git a/tests/files/Makefile.in b/tests/files/Makefile.in
index 1cf84c3..6ef1743 100644
--- a/tests/files/Makefile.in
+++ b/tests/files/Makefile.in
@@ -221,8 +221,6 @@ PACKAGE_VERSION_RELEASE = @PACKAGE_VERSION_RELEASE@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PLUGINDIR = @PLUGINDIR@
-POSTPROC_CFLAGS = @POSTPROC_CFLAGS@
-POSTPROC_LIBS = @POSTPROC_LIBS@
 PROFILE_CFLAGS = @PROFILE_CFLAGS@
 PYTHON = @PYTHON@
 PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@