From 2c1879424d86b598f78a8e3d618321793903bdef Mon Sep 17 00:00:00 2001 From: =?utf8?q?St=C3=A9phane=20Loeuillet?= Date: Wed, 5 Jan 2005 23:38:23 +0000 Subject: [PATCH] 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 --- ChangeLog | 9 +++++++++ configure.ac | 17 +++++++++++++++-- gst/asfdemux/gstasfdemux.c | 5 +++-- 3 files changed, 27 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 70dc471..bebbada 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2005-01-06 Stephane LOEUILLET + + * 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 Reviewed by: Ronald S. Bultje diff --git a/configure.ac b/configure.ac index 5809d93..b27d373 100644 --- 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 #if !defined(FAAD2_VERSION) || !defined(FAAD_FMT_DOUBLE) #error Not faad2 +#else +#include + +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 1c9a72a..28976cc 100644 --- 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; -- 2.7.4