http access: Use EnsureUTF8() on the ICY strings. Avoids "illegal byte sequence"...

[vlc] / modules / demux / Modules.am

diff --git a/modules/demux/Modules.am b/modules/demux/Modules.am
index 8a3d0049c36c37deb2860084a61243522f1cd06d..459d7428eb6a56bc91592c6cd00ff59a095a8554 100644 (file)
--- a/modules/demux/Modules.am
+++ b/modules/demux/Modules.am
@@ -1,4 +1,4 @@
-SUBDIRS = asf avi mp4 mpeg playlist
+SUBDIRS = asf avformat avi mp4 mpeg playlist
 SOURCES_a52sys = a52.c
 SOURCES_dtssys = dts.c
 SOURCES_flacsys = flac.c
@@ -34,13 +34,40 @@ SOURCES_demux_cdg = cdg.c
 SOURCES_smf = smf.c
 
 libvlc_LTLIBRARIES += \
-       librtp_plugin.la \
+       liba52sys_plugin.la \
+       libaiff_plugin.la \
+       libau_plugin.la \
+       libdemux_cdg_plugin.la \
+       libdemuxdump_plugin.la \
+       libdtssys_plugin.la \
+       libflacsys_plugin.la \
+       libmjpeg_plugin.la \
+       libnsv_plugin.la \
+       libnuv_plugin.la \
+       libpva_plugin.la \
+       librawdv_plugin.la \
+       librawvid_plugin.la \
+       libreal_plugin.la \
+       libsmf_plugin.la \
+       libsubtitle_plugin.la \
+       libtta_plugin.la \
+       libty_plugin.la \
+       libvc1_plugin.la \
+       libvobsub_plugin.la \
+       libvoc_plugin.la \
+       libwav_plugin.la \
+       libxa_plugin.la \
        $(NULL)
 
+if HAVE_LIBGCRYPT
 # RTP plugin
+libvlc_LTLIBRARIES += \
+       librtp_plugin.la
 librtp_plugin_la_SOURCES = \
        rtp.c rtp.h rtpsession.c
 librtp_plugin_la_CFLAGS = $(AM_CFLAGS) -I$(top_srcdir)/libs/srtp
-librtp_plugin_la_LIBADD = $(LTLIBVLCCORE) \
+librtp_plugin_la_LIBADD = $(AM_LIBADD) \
        $(top_builddir)/libs/srtp/libvlc_srtp.la
-
+librtp_plugin_la_DEPENDENCIES = \
+       $(top_builddir)/libs/srtp/libvlc_srtp.la
+endif