From f43a3f6accbfacc59e3fed2fc7d824a4a576edad Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Sat, 21 Jun 2008 18:56:08 +0000 Subject: [PATCH] tests/check/pipelines/oggmux.c: Properly ifdef tests to fix compilation. Original commit message from CVS: * tests/check/pipelines/oggmux.c: Properly ifdef tests to fix compilation. --- ChangeLog | 13 +++++++++---- tests/check/pipelines/oggmux.c | 6 ++++++ 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3f20c8218e..0b5d0e3d93 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-06-21 Thomas Vander Stichele + + * tests/check/pipelines/oggmux.c: + Properly ifdef tests to fix compilation. + 2008-06-20 Michael Smith * gst/playback/gstplay-marshal.list: @@ -138,10 +143,10 @@ 2008-06-04 Michael Smith * gst/playback/gstplaybasebin.c: - Disconnect signals from decodebins we created before we remove it from - playbin, to avoid crashes if the decodebin is eventually disposed after - the playbin itself (possible if the app takes a reference on the - decodebin). + Disconnect signals from decodebins we created before we remove it + from playbin, to avoid crashes if the decodebin is eventually + disposed after the playbin itself (possible if the app takes a + reference on the decodebin). Fixes #536521. 2008-06-04 Tim-Philipp Müller diff --git a/tests/check/pipelines/oggmux.c b/tests/check/pipelines/oggmux.c index c319b263ba..ef01eedca7 100644 --- a/tests/check/pipelines/oggmux.c +++ b/tests/check/pipelines/oggmux.c @@ -294,6 +294,7 @@ test_pipeline (const char *pipeline) gst_object_unref (bin); } +#ifdef HAVE_VORBIS GST_START_TEST (test_vorbis) { test_pipeline @@ -301,7 +302,9 @@ GST_START_TEST (test_vorbis) } GST_END_TEST; +#endif +#ifdef HAVE_THEORA GST_START_TEST (test_theora) { test_pipeline @@ -309,7 +312,9 @@ GST_START_TEST (test_theora) } GST_END_TEST; +#endif +#if (defined (HAVE_THEORA) && defined (HAVE_VORBIS)) GST_START_TEST (test_theora_vorbis) { test_pipeline @@ -327,6 +332,7 @@ GST_START_TEST (test_vorbis_theora) } GST_END_TEST; +#endif GST_START_TEST (test_simple_cleanup) { -- 2.34.1