summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 36f4c87)
raw | patch | inline | side by side (parent: 36f4c87)
author | Stéphane Loeuillet <gstreamer@leroutier.net> | |
Wed, 5 Jan 2005 23:38:23 +0000 (23:38 +0000) | ||
committer | Stéphane Loeuillet <gstreamer@leroutier.net> | |
Wed, 5 Jan 2005 23:38:23 +0000 (23:38 +0000) |
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
* 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
ChangeLog | patch | blob | history | |
configure.ac | patch | blob | history | |
gst/asfdemux/gstasfdemux.c | patch | blob | history |
diff --git a/ChangeLog b/ChangeLog
index 70dc471f8ed8a7ca4fa560e92355ede016fa9911..bebbada596c02a40e2a8eac709f1c03b3adbc9c3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
+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
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;
index 1c9a72a2ddd6fd32694db56299b42147cc61218a..28976cc78c4c9eae5318019e527e9ae8312d393c 100644 (file)
*/
- 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;