summaryrefslogtreecommitdiffstats
path: root/ext
diff options
context:
space:
mode:
authorStefan Kost <ensonic@users.sourceforge.net>2007-02-11 11:35:47 +0000
committerStefan Kost <ensonic@users.sourceforge.net>2007-02-11 11:35:47 +0000
commit8450ee444c3b233987ec6b4c3147d80838d2d4e6 (patch)
treef60671d9d50f41c102b807239b911286ac4f8404 /ext
parent810e30e924070b2bdb5c9df5f6e1063c03ea63b6 (diff)
downloadgst-plugins-bad-8450ee444c3b233987ec6b4c3147d80838d2d4e6.tar.gz
gst-plugins-bad-8450ee444c3b233987ec6b4c3147d80838d2d4e6.tar.bz2
gst-plugins-bad-8450ee444c3b233987ec6b4c3147d80838d2d4e6.zip
configure.ac: Tell the code which faad it is, so that we can adjust the hacks needed.
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.
Diffstat (limited to 'ext')
-rw-r--r--ext/faad/gstfaad.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/ext/faad/gstfaad.c b/ext/faad/gstfaad.c
index 72530138..47be4559 100644
--- a/ext/faad/gstfaad.c
+++ b/ext/faad/gstfaad.c
@@ -38,11 +38,21 @@
* but not all, hence this Truly Evil Hack. This hack will need updating if
* 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 faacDecInit2 faacDecInit2_no_definition
+#endif
#include "gstfaad.h"
+#ifdef FAAD_IS_NEAAC
+#undef NeAACDecInit
+#undef NeAACDecInit2
+#else
#undef faacDecInit
#undef faacDecInit2
+#endif
extern long faacDecInit (faacDecHandle, guint8 *, guint32, guint32 *, guint8 *);
extern int8_t faacDecInit2 (faacDecHandle, guint8 *, guint32,