FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

configure.ac: Tell the code which faad it is, so that we can adjust the hacks needed.

Browse Source 
Original commit message from CVS:
* configure.ac:
Tell the code which faad it is, so that we can adjust the hacks
needed.
* ext/faad/gstfaad.c:
Make our hacks dependent on the fadd lib in use.
This commit is contained in:
Stefan Kost 2007-02-11 11:35:47 +00:00
parent 810e30e924
commit 8450ee444c
3 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2007-02-11 Stefan Kost <ensonic@users.sf.net>
* configure.ac:
Tell the code which faad it is, so that we can adjust the hacks
needed.
* ext/faad/gstfaad.c:
Make our hacks dependent on the fadd lib in use.
2007-02-11 Stefan Kost <ensonic@users.sf.net> 2007-02-11 Stefan Kost <ensonic@users.sf.net>
* configure.ac: * configure.ac:

6
configure.ac
View File

@ -541,7 +541,10 @@ GST_CHECK_FEATURE(FAAD, [AAC decoder plug-in], faad, [
FAAD_LIBS="-lfaad -lm", HAVE_FAAD="no") FAAD_LIBS="-lfaad -lm", HAVE_FAAD="no")
if test $HAVE_FAAD = "no"; then if test $HAVE_FAAD = "no"; then
GST_CHECK_LIBHEADER(FAAD, faad, NeAACDecOpen, -lm, neaacdec.h, GST_CHECK_LIBHEADER(FAAD, faad, NeAACDecOpen, -lm, neaacdec.h,
FAAD_LIBS="-lfaad -lm", HAVE_FAAD="no") [ FAAD_LIBS="-lfaad -lm"
AC_DEFINE(FAAD_IS_NEAAC, 1, [Define if AAC is using new api prefix])
],
HAVE_FAAD="no",)
fi fi
if test $HAVE_FAAD = "yes"; then if test $HAVE_FAAD = "yes"; then
AC_MSG_CHECKING([Checking for FAAD >= 2]) AC_MSG_CHECKING([Checking for FAAD >= 2])
@ -573,6 +576,7 @@ return 0;
fi fi
AS_SCRUB_INCLUDE(FAAD_CFLAGS) AS_SCRUB_INCLUDE(FAAD_CFLAGS)
AC_SUBST(FAAD_LIBS) AC_SUBST(FAAD_LIBS)
AC_SUBST(FAAD_IS_NEAAC)
]) ])
dnl *** gsm *** dnl *** gsm ***

10
ext/faad/gstfaad.c
View File

@ -38,11 +38,21 @@
* but not all, hence this Truly Evil Hack. This hack will need updating if * but not all, hence this Truly Evil Hack. This hack will need updating if
* upstream ever releases something with the new API. * upstream ever releases something with the new API.
*/ */
#ifdef FAAD_IS_NEAAC
#define NeAACDecInit NeAACDecInit_no_definition
#define NeAACDecInit2 NeAACDecInit2_no_definition
#else
#define faacDecInit faacDecInit_no_definition #define faacDecInit faacDecInit_no_definition
#define faacDecInit2 faacDecInit2_no_definition #define faacDecInit2 faacDecInit2_no_definition
#endif
#include "gstfaad.h" #include "gstfaad.h"
#ifdef FAAD_IS_NEAAC
#undef NeAACDecInit
#undef NeAACDecInit2
#else
#undef faacDecInit #undef faacDecInit
#undef faacDecInit2 #undef faacDecInit2
#endif
extern long faacDecInit (faacDecHandle, guint8 *, guint32, guint32 *, guint8 *); extern long faacDecInit (faacDecHandle, guint8 *, guint32, guint32 *, guint8 *);
extern int8_t faacDecInit2 (faacDecHandle, guint8 *, guint32, extern int8_t faacDecInit2 (faacDecHandle, guint8 *, guint32,