Win32: use DWORD_PTR instead of DWORD for callback declaration

[vlc] / modules / stream_out / Modules.am

diff --git a/modules/stream_out/Modules.am b/modules/stream_out/Modules.am
index 57ebeb56dc30fe090c0a415c3ad9a67955b524a0..8c24a49202223ef1d831e23bebf8da9512a4080c 100644 (file)
--- a/modules/stream_out/Modules.am
+++ b/modules/stream_out/Modules.am
@@ -1,8 +1,9 @@
-SUBDIRS = transrate
+SUBDIRS = transcode
+
 SOURCES_stream_out_dummy = dummy.c
+SOURCES_stream_out_delay = delay.c
 SOURCES_stream_out_description = description.c
 SOURCES_stream_out_standard = standard.c
-SOURCES_stream_out_transcode = transcode.c
 SOURCES_stream_out_duplicate = duplicate.c
 SOURCES_stream_out_es = es.c
 SOURCES_stream_out_display = display.c
@@ -11,12 +12,18 @@ SOURCES_stream_out_switcher = switcher.c
 SOURCES_stream_out_bridge = bridge.c
 SOURCES_stream_out_mosaic_bridge = mosaic_bridge.c
 SOURCES_stream_out_autodel = autodel.c
+SOURCES_stream_out_record = record.c
+SOURCES_stream_out_raop = raop.c
+SOURCES_stream_out_smem = smem.c
+SOURCES_stream_out_setid = setid.c
+SOURCES_stream_out_langfromtelx = langfromtelx.c
+SOURCES_stream_out_select = select.c
 
 libvlc_LTLIBRARIES += \
        libstream_out_dummy_plugin.la \
+       libstream_out_delay_plugin.la \
        libstream_out_description_plugin.la \
        libstream_out_standard_plugin.la \
-       libstream_out_transcode_plugin.la \
        libstream_out_duplicate_plugin.la \
        libstream_out_es_plugin.la \
        libstream_out_display_plugin.la \
@@ -24,17 +31,26 @@ libvlc_LTLIBRARIES += \
        libstream_out_bridge_plugin.la \
        libstream_out_mosaic_bridge_plugin.la \
        libstream_out_autodel_plugin.la \
+       libstream_out_record_plugin.la \
+       libstream_out_smem_plugin.la \
+       libstream_out_setid_plugin.la \
+       libstream_out_langfromtelx_plugin.la \
+       libstream_out_select_plugin.la \
        $(NULL)
 
-if HAVE_LIBGCRYPT
 # RTP plugin
 libvlc_LTLIBRARIES += \
        libstream_out_rtp_plugin.la
 libstream_out_rtp_plugin_la_SOURCES = \
-       rtp.c rtp.h rtpfmt.c rtcp.c rtsp.c
-libstream_out_rtp_plugin_la_CFLAGS = $(AM_CFLAGS) -I$(top_srcdir)/libs/srtp
-libstream_out_rtp_plugin_la_LIBADD = $(AM_LIBADD) \
-       $(top_builddir)/libs/srtp/libvlc_srtp.la
-libstream_out_rtp_plugin_la_DEPENDENCIES = \
-       $(top_builddir)/libs/srtp/libvlc_srtp.la
+       rtp.c rtp.h rtpfmt.c rtcp.c rtsp.c vod.c
+libstream_out_rtp_plugin_la_CFLAGS = $(AM_CFLAGS)
+libstream_out_rtp_plugin_la_LIBADD = $(AM_LIBADD) $(SOCKET_LIBS)
+libstream_out_rtp_plugin_la_DEPENDENCIES =
+if HAVE_GCRYPT
+SRTP_CFLAGS = -I$(top_srcdir)/modules/access/rtp
+SRTP_LIBS = $(top_builddir)/modules/access/rtp/libvlc_srtp.la
+libstream_out_rtp_plugin_la_CFLAGS += -DHAVE_SRTP $(SRTP_CFLAGS) \
+       $(GCRYPT_CFLAGS)
+libstream_out_rtp_plugin_la_LIBADD += $(SRTP_LIBS) $(GCRYPT_LIBS)
+libstream_out_rtp_plugin_la_DEPENDENCIES += $(SRTP_LIBS)
 endif