diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-11-03 23:29:48 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-11-03 23:29:48 +0000 |
| commit | 7626abc51a753ce512843e624d3bb4653ff514ce (patch) | |
| tree | 3a13d4758a9bea86c5677e936ca88c01f0f39720 /src | |
| parent | 4eb04918173bb229623e500b376caf391442ac0b (diff) | |
| download | xine-lib-7626abc51a753ce512843e624d3bb4653ff514ce.tar.gz xine-lib-7626abc51a753ce512843e624d3bb4653ff514ce.tar.bz2 | |
Allow external libfaad.
Diffstat (limited to 'src')
| -rw-r--r-- | src/libxineadec/Makefile.am | 5 | ||||
| -rw-r--r-- | src/libxineadec/xine_faad_decoder.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/libxineadec/Makefile.am b/src/libxineadec/Makefile.am index 0680f8196..a85497bbf 100644 --- a/src/libxineadec/Makefile.am +++ b/src/libxineadec/Makefile.am @@ -80,5 +80,6 @@ xineplug_decode_a52_la_LIBADD = $(XINE_LIB) $(LTLIBINTL) $(A52DEC_LIBS) -lm xineplug_decode_a52_la_CFLAGS = $(AM_CFLAGS) $(A52DEC_CFLAGS) xineplug_decode_faad_la_SOURCES = xine_faad_decoder.c -xineplug_decode_faad_la_LIBADD = $(XINE_LIB) $(LTLIBINTL) $(top_builddir)/contrib/libfaad/libfaad.la -lm -xineplug_decode_faad_la_CPPFLAGS = -I$(top_srcdir)/contrib/libfaad +xineplug_decode_faad_la_DEPENDENCIES = $(FAAD_DEPS) +xineplug_decode_faad_la_LIBADD = $(XINE_LIB) $(LTLIBINTL) $(FAAD_LIBS) -lm +xineplug_decode_faad_la_CFLAGS = $(FAAD_CFLAGS) diff --git a/src/libxineadec/xine_faad_decoder.c b/src/libxineadec/xine_faad_decoder.c index de2e96177..2892dbe75 100644 --- a/src/libxineadec/xine_faad_decoder.c +++ b/src/libxineadec/xine_faad_decoder.c @@ -38,10 +38,14 @@ #include "audio_out.h" #include "buffer.h" #include "xineutils.h" +#ifdef HAVE_NEAACDEC_H +#include <neaacdec.h> +#else #include "common.h" #include "structs.h" #include "decoder.h" #include "syntax.h" +#endif #define FAAD_MIN_STREAMSIZE 768 /* 6144 bits/channel */ |