configure.ac: don't compile faad plugin if a RC of 2.0 is found

Original commit message from CVS:

* configure.ac:
don't compile faad plugin if a RC of 2.0 is found

* gst/asfdemux/gstasfdemux.c:
(gst_asf_demux_process_ext_content_desc):
try to make Solaris compiler happier

diff --git a/ChangeLog b/ChangeLog
index 70dc471f8ed8a7ca4fa560e92355ede016fa9911..bebbada596c02a40e2a8eac709f1c03b3adbc9c3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-01-06  Stephane LOEUILLET  <stephane.loeuillet@tiscali.fr>
+
+       * configure.ac:
+        don't compile faad plugin if a RC of 2.0 is found
+
+       * gst/asfdemux/gstasfdemux.c:
+       (gst_asf_demux_process_ext_content_desc):
+        try to make Solaris compiler happier
+
 2005-01-06  Paul Jack  <pjack@sfaf.org>
 
        Reviewed by:  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>

diff --git a/configure.ac b/configure.ac
index 5809d93035b0043f828e07e7e12020431d67728a..b27d373fee960d49e83e1ca52c6859565ed4470e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1015,12 +1015,25 @@ GST_CHECK_FEATURE(FAAD, [AAC decoder plug-in], faad, [
   GST_CHECK_LIBHEADER(FAAD, faad, faacDecOpen, -lm, faad.h, FAAD_LIBS="-lfaad -lm", HAVE_FAAD="no")
   if test $HAVE_FAAD = "yes"; then
     AC_MSG_CHECKING([Checking for FAAD >= 2])
-    AC_TRY_COMPILE([
+    AC_TRY_RUN([
+
 #include <faad.h>
 #if !defined(FAAD2_VERSION) || !defined(FAAD_FMT_DOUBLE)
 #error Not faad2
+#else
+#include <string.h>
+
+int main()
+{
+char version[9] = FAAD2_VERSION;
+// a release candidate of 2.0 is not enought for us
+if ( strstr( version, "2.0 RC" ) ) { return 1; }
+
+return 0;
+}
+
 #endif
-    ], [ return 0; ],
+    ],
        [ HAVE_FAAD="yes" && AC_MSG_RESULT(yes)],
        [ HAVE_FAAD="no"  && AC_MSG_RESULT(no)])
   fi;

diff --git a/gst/asfdemux/gstasfdemux.c b/gst/asfdemux/gstasfdemux.c
index 1c9a72a2ddd6fd32694db56299b42147cc61218a..28976cc78c4c9eae5318019e527e9ae8312d393c 100644 (file)
--- a/gst/asfdemux/gstasfdemux.c
+++ b/gst/asfdemux/gstasfdemux.c
@@ -652,8 +652,9 @@ WM/MCDI
 
 */
 
-  const guchar *tags[] = { GST_TAG_GENRE, GST_TAG_ALBUM, GST_TAG_ARTIST, NULL };
-  const guchar *tags_label[] =
+  const guchar *tags[4] =
+      { GST_TAG_GENRE, GST_TAG_ALBUM, GST_TAG_ARTIST, NULL };
+  const guchar *tags_label[4] =
       { "WM/Genre", "WM/AlbumTitle", "WM/AlbumArtist", NULL };
 
   GstTagList *taglist;