diff options
Diffstat (limited to 'src/liba52')
| -rw-r--r-- | src/liba52/Makefile.am | 20 | ||||
| -rw-r--r-- | src/liba52/xine_decoder.c | 19 |
2 files changed, 32 insertions, 7 deletions
diff --git a/src/liba52/Makefile.am b/src/liba52/Makefile.am index 6857bcea3..d786ab250 100644 --- a/src/liba52/Makefile.am +++ b/src/liba52/Makefile.am @@ -4,16 +4,28 @@ libdir = $(XINE_PLUGINDIR) lib_LTLIBRARIES = xineplug_decode_a52.la -xineplug_decode_a52_la_SOURCES = \ +if EXTERNAL_A52DEC +internal_sources = +else +internal_sources = \ bitstream.c \ bit_allocate.c \ - crc.c \ downmix.c \ imdct.c \ - parse.c \ - xine_decoder.c + parse.c +endif + +xineplug_decode_a52_la_SOURCES = \ + crc.c \ + xine_decoder.c \ + $(internal_sources) +if EXTERNAL_A52DEC +xineplug_decode_a52_la_LIBADD = $(XINE_LIB) -la52 -lm +else xineplug_decode_a52_la_LIBADD = $(XINE_LIB) +endif + xineplug_decode_a52_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ noinst_HEADERS = \ diff --git a/src/liba52/xine_decoder.c b/src/liba52/xine_decoder.c index 74998e50e..3b5018268 100644 --- a/src/liba52/xine_decoder.c +++ b/src/liba52/xine_decoder.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: xine_decoder.c,v 1.75 2005/05/28 11:24:35 jstembridge Exp $ + * $Id: xine_decoder.c,v 1.76 2005/05/29 00:47:48 miguelfreitas Exp $ * * stuff needed to turn liba52 into a xine decoder plugin */ @@ -29,6 +29,8 @@ /* avoid compiler warnings */ #define _BSD_SOURCE 1 +#include <config.h> + #include <stdlib.h> #include <unistd.h> #include <string.h> @@ -46,8 +48,19 @@ #include "xine_internal.h" #include "audio_out.h" -#include "a52.h" -#include "a52_internal.h" + +#ifdef HAVE_A52DEC_A52_H +# include <a52dec/a52.h> +#else +# include "a52.h" +#endif + +#ifdef HAVE_A52DEC_A52_INTERNAL_H +# include <a52dec/a52_internal.h> +#else +# include "a52_internal.h" +#endif + #include "buffer.h" #include "xineutils.h" |