summaryrefslogtreecommitdiffstats
path: root/ext/faad/gstfaad.h
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2008-03-18 10:12:40 +0000
committerAndy Wingo <wingo@pobox.com>2008-03-18 10:12:40 +0000
commit603b409c33ecc45e2e9b42e368ada98ff0c14d94 (patch)
treebb711123b5c6253a22b88ec7a595e717b3b571b1 /ext/faad/gstfaad.h
parent0361555869bfd91785b5c67700f59e1f08d3b063 (diff)
downloadgst-plugins-bad-603b409c33ecc45e2e9b42e368ada98ff0c14d94.tar.gz
gst-plugins-bad-603b409c33ecc45e2e9b42e368ada98ff0c14d94.tar.bz2
gst-plugins-bad-603b409c33ecc45e2e9b42e368ada98ff0c14d94.zip
ext/faad/gstfaad.c (gst_faad_chain): Fix a bad format argument, and a potential int overflow.
Original commit message from CVS: 2008-03-18 Andy Wingo <wingo@pobox.com> * ext/faad/gstfaad.c (gst_faad_chain): Fix a bad format argument, and a potential int overflow. * ext/faad/gstfaad.h: Include <neaacdec.h> if faad is neaac. Avoids a #warning about an ignored #pragma.
Diffstat (limited to 'ext/faad/gstfaad.h')
-rw-r--r--ext/faad/gstfaad.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/ext/faad/gstfaad.h b/ext/faad/gstfaad.h
index 4297e985..7c20a01f 100644
--- a/ext/faad/gstfaad.h
+++ b/ext/faad/gstfaad.h
@@ -21,7 +21,11 @@
#define __GST_FAAD_H__
#include <gst/gst.h>
+#ifdef FAAD_IS_NEAAC
+#include <neaacdec.h>
+#else
#include <faad.h>
+#endif
G_BEGIN_DECLS