mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-14 10:18:29 +00:00
Code Issues 1 Projects Releases Wiki Activity

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

Browse source 
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
This commit is contained in:
Stéphane Loeuillet 2005-01-05 23:38:23 +00:00
parent 36f4c874ae
commit 2c1879424d
3 changed files with 27 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -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>

17
configure.ac
View file

@ -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;

5
gst/asfdemux/gstasfdemux.c
View file

@ -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;