tag 399438 + patch
thanks
Here's a patch to undo the weird manual definition of faacDecInit and
faacDecInit2. After applying it, re-run autogen.sh so that the configure
script is regenerated.
--
Sam Morris
http://robots.org.uk/
PGP key id 1024D/5EA01078
3412 EA18 1277 354B 991B C869 B219 7FDB 5EA0 1078
--- gst-plugins-bad0.10-0.10.3.orig/ext/faad/gstfaad.c
+++ gst-plugins-bad0.10-0.10.3/ext/faad/gstfaad.c
@@ -38,15 +38,15 @@
* but not all, hence this Truly Evil Hack. This hack will need updating if
* upstream ever releases something with the new API.
*/
-#define faacDecInit faacDecInit_no_definition
-#define faacDecInit2 faacDecInit2_no_definition
+/*#define faacDecInit faacDecInit_no_definition
+#define faacDecInit2 faacDecInit2_no_definition*/
#include "gstfaad.h"
-#undef faacDecInit
-#undef faacDecInit2
+/*#undef faacDecInit
+#undef faacDecInit2*/
-extern long faacDecInit (faacDecHandle, guint8 *, guint32, guint32 *, guint8 *);
+/*extern long faacDecInit (faacDecHandle, guint8 *, guint32, guint32 *, guint8 *);
extern int8_t faacDecInit2 (faacDecHandle, guint8 *, guint32,
- guint32 *, guint8 *);
+ guint32 *, guint8 *);*/
GST_DEBUG_CATEGORY_STATIC (faad_debug);
#define GST_CAT_DEFAULT faad_debug
--- gst-plugins-bad0.10-0.10.3.orig/configure.ac
+++ gst-plugins-bad0.10-0.10.3/configure.ac
@@ -397,7 +397,7 @@
translit(dnm, m, l) AM_CONDITIONAL(USE_FAAD, true)
GST_CHECK_FEATURE(FAAD, [AAC decoder plug-in], faad, [
HAVE_FAAD="yes"
- GST_CHECK_LIBHEADER(FAAD, faad, faacDecOpen, -lm, faad.h,
+ GST_CHECK_LIBHEADER(FAAD, faad, NeAACDecOpen, -lm, faad.h,
FAAD_LIBS="-lfaad -lm", HAVE_FAAD="no")
if test $HAVE_FAAD = "yes"; then
AC_MSG_CHECKING([Checking for FAAD >= 2])
