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.

diff --git a/ChangeLog b/ChangeLog
index 3f20c8218e554fe28670c5a4e48993ffd4ddc5d3..0b5d0e3d93ad45c950eb32ed3c8818e37373ddc5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-21  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+       * tests/check/pipelines/oggmux.c:
+         Properly ifdef tests to fix compilation.
+

 2008-06-20  Michael Smith <msmith@songbirdnest.com>
 
        * gst/playback/gstplay-marshal.list:
 2008-06-20  Michael Smith <msmith@songbirdnest.com>
 
        * gst/playback/gstplay-marshal.list:


@@ -138,10 +143,10 @@
 2008-06-04  Michael Smith <msmith@songbirdnest.com>
 
        * gst/playback/gstplaybasebin.c:
 2008-06-04  Michael Smith <msmith@songbirdnest.com>
 
        * 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  <tim.muller at collabora co uk>
          Fixes #536521.
 
 2008-06-04  Tim-Philipp Müller  <tim.muller at collabora co uk>

diff --git a/tests/check/pipelines/oggmux.c b/tests/check/pipelines/oggmux.c
index c319b263ba9082b0c14417214fbe93b2473a0bff..ef01eedca7827e0d6d3db0ab8a87d5523160ddd9 100644 (file)
--- 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);
 }
 
   gst_object_unref (bin);
 }
 

+#ifdef HAVE_VORBIS

 GST_START_TEST (test_vorbis)
 {
   test_pipeline
 GST_START_TEST (test_vorbis)
 {
   test_pipeline


@@ -301,7 +302,9 @@ GST_START_TEST (test_vorbis)
 }
 
 GST_END_TEST;
 }
 
 GST_END_TEST;

+#endif

 
 

+#ifdef HAVE_THEORA

 GST_START_TEST (test_theora)
 {
   test_pipeline
 GST_START_TEST (test_theora)
 {
   test_pipeline


@@ -309,7 +312,9 @@ GST_START_TEST (test_theora)
 }
 
 GST_END_TEST;
 }
 
 GST_END_TEST;

+#endif

 
 

+#if (defined (HAVE_THEORA) && defined (HAVE_VORBIS))

 GST_START_TEST (test_theora_vorbis)
 {
   test_pipeline
 GST_START_TEST (test_theora_vorbis)
 {
   test_pipeline


@@ -327,6 +332,7 @@ GST_START_TEST (test_vorbis_theora)
 }
 
 GST_END_TEST;
 }
 
 GST_END_TEST;

+#endif

 
 GST_START_TEST (test_simple_cleanup)
 {
 
 GST_START_TEST (test_simple_cleanup)
 {