diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-06-12 22:32:26 +0100 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-06-12 22:32:26 +0100 |
| commit | 58d9467d1b2188463b216b79b51a423559e97a75 (patch) | |
| tree | 233624f3ae7213c376b6b293160b153061ed7e43 /src/demuxers | |
| parent | aba1fd253b3a2c5cfa13e13eefea469e4e3dff9b (diff) | |
| parent | 125e98b02c9d62e09e154f176aacc2b9c51fd164 (diff) | |
| download | xine-lib-58d9467d1b2188463b216b79b51a423559e97a75.tar.gz xine-lib-58d9467d1b2188463b216b79b51a423559e97a75.tar.bz2 | |
A nice simple merge from 1.1.
Hopefully, I've applied all of the $(LTLIBINTL) changes correctly...
Diffstat (limited to 'src/demuxers')
| -rw-r--r-- | src/demuxers/Makefile.am | 14 | ||||
| -rw-r--r-- | src/demuxers/demux_ac3.c | 3 | ||||
| -rw-r--r-- | src/demuxers/demux_dts.c | 3 |
3 files changed, 13 insertions, 7 deletions
diff --git a/src/demuxers/Makefile.am b/src/demuxers/Makefile.am index 1dec2eabf..ac132463b 100644 --- a/src/demuxers/Makefile.am +++ b/src/demuxers/Makefile.am @@ -55,10 +55,10 @@ xineplug_LTLIBRARIES = \ xineplug_dmx_flv.la xineplug_dmx_avi_la_SOURCES = demux_avi.c -xineplug_dmx_avi_la_LIBADD = $(XINE_LIB) +xineplug_dmx_avi_la_LIBADD = $(XINE_LIB) $(LTLIBINTL) xineplug_dmx_mpeg_block_la_SOURCES = demux_mpeg_block.c -xineplug_dmx_mpeg_block_la_LIBADD = $(XINE_LIB) +xineplug_dmx_mpeg_block_la_LIBADD = $(XINE_LIB) $(LTLIBINTL) xineplug_dmx_mpeg_la_SOURCES = demux_mpeg.c xineplug_dmx_mpeg_la_LIBADD = $(XINE_LIB) @@ -67,7 +67,7 @@ xineplug_dmx_mpeg_elem_la_SOURCES = demux_elem.c xineplug_dmx_mpeg_elem_la_LIBADD = $(XINE_LIB) xineplug_dmx_mpeg_pes_la_SOURCES = demux_mpeg_pes.c -xineplug_dmx_mpeg_pes_la_LIBADD = $(XINE_LIB) +xineplug_dmx_mpeg_pes_la_LIBADD = $(XINE_LIB) $(LTLIBINTL) xineplug_dmx_mpeg_ts_la_SOURCES = demux_ts.c xineplug_dmx_mpeg_ts_la_LIBADD = $(XINE_LIB) @@ -77,7 +77,7 @@ xineplug_dmx_qt_la_LIBADD = $(XINE_LIB) $(ZLIB_LIBS) xineplug_dmx_qt_la_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_CPPFLAGS) xineplug_dmx_asf_la_SOURCES = demux_asf.c asfheader.c -xineplug_dmx_asf_la_LIBADD = $(XINE_LIB) +xineplug_dmx_asf_la_LIBADD = $(XINE_LIB) $(LTLIBINTL) $(LTLIBICONV) xineplug_dmx_asf_la_CFLAGS = $(AM_CFLAGS) -fno-strict-aliasing xineplug_dmx_fli_la_SOURCES = demux_fli.c @@ -104,7 +104,7 @@ xineplug_dmx_games_la_SOURCES = group_games.c demux_eawve.c \ demux_vqa.c demux_wc3movie.c demux_str.c \ demux_film.c demux_smjpeg.c demux_4xm.c \ demux_vmd.c -xineplug_dmx_games_la_LIBADD = $(XINE_LIB) +xineplug_dmx_games_la_LIBADD = $(XINE_LIB) $(LTLIBINTL) xineplug_dmx_audio_la_SOURCES = group_audio.c demux_aud.c demux_aiff.c \ demux_cdda.c demux_mpgaudio.c \ @@ -137,7 +137,7 @@ xineplug_dmx_matroska_la_CFLAGS = $(AM_CFLAGS) -fno-strict-aliasing xineplug_dmx_matroska_la_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_CPPFLAGS) xineplug_dmx_iff_la_SOURCES = demux_iff.c -xineplug_dmx_iff_la_LIBADD = $(XINE_LIB) +xineplug_dmx_iff_la_LIBADD = $(XINE_LIB) $(LTLIBINTL) xineplug_dmx_flv_la_SOURCES = demux_flv.c -xineplug_dmx_flv_la_LIBADD = $(XINE_LIB) +xineplug_dmx_flv_la_LIBADD = $(XINE_LIB) $(LTLIBINTL) diff --git a/src/demuxers/demux_ac3.c b/src/demuxers/demux_ac3.c index 279da6336..bb4bc8b4e 100644 --- a/src/demuxers/demux_ac3.c +++ b/src/demuxers/demux_ac3.c @@ -36,6 +36,9 @@ #include <string.h> #include <stdlib.h> #include <ctype.h> +#ifdef HAVE_ALLOCA_H +#include <alloca.h> +#endif #define LOG_MODULE "demux_ac3" #define LOG_VERBOSE diff --git a/src/demuxers/demux_dts.c b/src/demuxers/demux_dts.c index a9541b6f7..8f6f9c66e 100644 --- a/src/demuxers/demux_dts.c +++ b/src/demuxers/demux_dts.c @@ -32,6 +32,9 @@ #include <string.h> #include <stdlib.h> #include <ctype.h> +#ifdef HAVE_ALLOCA_H +#include <alloca.h> +#endif #define LOG_MODULE "demux_dts" #define LOG_VERBOSE |