Fix compile on systems with broken faad headers.

Original commit message from CVS:
Fix compile on systems with broken faad headers.

diff --git a/ChangeLog b/ChangeLog
index 8bd6484abfea519840f063a1cb368d3c3e516252..9b8b8f2af9c39c3502b115bcb0a56fda79d9b38a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-11  Michael Smith <msmith@fluendo.com>
+
+       * ext/faad/gstfaad.c: (gst_faad_setcaps), (gst_faad_chain):
+         Make this compile on systems with broken headers. 
+
 2005-11-11  Michael Smith <msmith@fluendo.com>
 
        * ext/faad/gstfaad.c: (gst_faad_setcaps), (gst_faad_chain):

diff --git a/ext/faad/gstfaad.c b/ext/faad/gstfaad.c
index 29b83191746f394e011b4710bf81b44664454722..f02aa1753417c6532ffef97e245155a1a49b0b95 100644 (file)
--- a/ext/faad/gstfaad.c
+++ b/ext/faad/gstfaad.c
@@ -25,7 +25,8 @@
 #include <gst/audio/audio.h>
 #include <gst/audio/multichannel.h>
 
-/* These are the correct types for these functions, as defined in the source.
+/* These are the correct types for these functions, as defined in the source,
+ * with types changed to match glib types, since those are defined for us.
  * However, upstream FAAD is distributed with a broken header file that defined
  * these wrongly (in a way which was broken on 64 bit systems).
  * Upstream CVS still has the bug, but has also renamed all the public symbols
@@ -36,16 +37,15 @@
  * but not all, hence this Truly Evil Hack. This hack will need updating if
  * upstream ever releases something with the new API.
  */
-#define faadDecInit faadDecInit_no_definition
-#define faadDecInit2 faadDecInit2_no_definition
+#define faacDecInit faadDecInit_no_definition
+#define faacDecInit2 faadDecInit2_no_definition
 #include "gstfaad.h"
-#undef faadDecInit
-#undef faadDecInit2
+#undef faacDecInit
+#undef faacDecInit2
 
-extern long faadDecInit (faacDecHandle, uint8_t *, uint32_t,
-    uint32_t *, uint8_t *);
-extern int8_t faadDecInit2 (faacDecHandle, uint8_t *, uint32_t,
-    uint32_t *, uint8_t *);
+extern long faacDecInit (faacDecHandle, guint8 *, guint32, guint32 *, guint8 *);
+extern int8_t faacDecInit2 (faacDecHandle, guint8 *, guint32,
+    guint32 *, guint8 *);
 
 GST_DEBUG_CATEGORY_STATIC (faad_debug);
 #define GST_CAT_DEFAULT faad_debug
@@ -227,7 +227,7 @@ gst_faad_setcaps (GstPad * pad, GstCaps * caps)
     buf = GST_BUFFER (gst_value_get_mini_object (value));
 
     /* someone forgot that char can be unsigned when writing the API */
-    if ((gint8) faadDecInit2 (faad->handle,
+    if ((gint8) faacDecInit2 (faad->handle,
             GST_BUFFER_DATA (buf), GST_BUFFER_SIZE (buf), &samplerate,
             &channels) < 0) {
       GST_DEBUG ("faacDecInit2() failed");