Commit 469cfd7e authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Don't use VLC_ADD_PLUGIN for common sout and packetizers plugins

parent 5d02805d
......@@ -1290,12 +1290,6 @@ VLC_ADD_PLUGIN([access_filter_timeshift])
VLC_ADD_PLUGIN([access_filter_record])
VLC_ADD_PLUGIN([access_filter_dump])
VLC_ADD_PLUGIN([access_filter_bandwidth])
dnl Packetizers:
VLC_ADD_PLUGIN([packetizer_mpegvideo])
VLC_ADD_PLUGIN([packetizer_h264])
VLC_ADD_PLUGIN([packetizer_mpeg4video])
VLC_ADD_PLUGIN([packetizer_mpeg4audio])
VLC_ADD_PLUGIN([packetizer_vc1])
ALIASES="${ALIASES} cvlc"
......@@ -1725,43 +1719,6 @@ dnl Stream output
dnl
AC_ARG_ENABLE(sout,
[ --enable-sout Stream output modules (default enabled)])
if test "${enable_sout}" != "no"
then
dnl Access outputs:
VLC_ADD_PLUGIN([access_output_dummy])
VLC_ADD_PLUGIN([access_output_udp])
VLC_ADD_PLUGIN([access_output_file])
VLC_ADD_PLUGIN([access_output_http])
dnl Muxers:
VLC_ADD_PLUGIN([mux_ps])
VLC_ADD_PLUGIN([mux_avi])
VLC_ADD_PLUGIN([mux_mp4])
VLC_ADD_PLUGIN([mux_asf])
VLC_ADD_PLUGIN([mux_dummy])
VLC_ADD_PLUGIN([mux_wav])
VLC_ADD_PLUGIN([mux_mpjpeg])
dnl Packetizers (FIXME: why are the others outside --enable-sout??):
VLC_ADD_PLUGIN([packetizer_copy])
dnl Stream outputs:
VLC_ADD_PLUGIN([stream_out_dummy])
VLC_ADD_PLUGIN([stream_out_standard])
VLC_ADD_PLUGIN([stream_out_es])
VLC_ADD_PLUGIN([stream_out_rtp])
VLC_ADD_PLUGIN([stream_out_description])
VLC_ADD_PLUGIN([stream_out_duplicate])
VLC_ADD_PLUGIN([stream_out_display])
VLC_ADD_PLUGIN([stream_out_transcode])
VLC_ADD_PLUGIN([stream_out_bridge])
VLC_ADD_PLUGIN([stream_out_mosaic_bridge])
VLC_ADD_PLUGIN([stream_out_autodel])
VLC_ADD_PLUGIN([stream_out_gather])
# VLC_ADD_PLUGIN([stream_out_transrate])
dnl Misc:
VLC_ADD_PLUGIN([vod_rtsp])
VLC_ADD_PLUGIN([profile_parser])
AC_DEFINE(ENABLE_SOUT, 1, Define if you want the stream output support)
fi
AM_CONDITIONAL(ENABLE_SOUT, [test "${enable_sout}" != "no"])
AC_ARG_ENABLE(switcher,
......
......@@ -3,3 +3,10 @@ SOURCES_access_output_file = file.c
SOURCES_access_output_udp = udp.c
SOURCES_access_output_http = http.c bonjour.c bonjour.h
SOURCES_access_output_shout = shout.c
libvlc_LTLIBRARIES += \
libaccess_output_dummy_plugin.la \
libaccess_output_file_plugin.la \
libaccess_output_udp_plugin.la \
libaccess_output_http_plugin.la \
$(NULL)
......@@ -14,3 +14,9 @@ SOURCES_svg = svg.c
SOURCES_profile_parser = profile_parser.c
SOURCES_audioscrobbler = audioscrobbler.c
SOURCES_inhibit = inhibit.c
if ENABLE_SOUT
libvlc_LTLIBRARIES += \
libvod_rtsp_plugin.la \
libprofile_parser_plugin.la
endif
......@@ -5,3 +5,12 @@ SOURCES_mux_mp4 = mp4.c
SOURCES_mux_asf = asf.c
SOURCES_mux_wav = wav.c
SOURCES_mux_mpjpeg = mpjpeg.c
libvlc_LTLIBRARIES += \
libmux_dummy_plugin.la \
libmux_avi_plugin.la \
libmux_mp4_plugin.la \
libmux_asf_plugin.la \
libmux_wav_plugin.la \
libmux_mpjpeg_plugin.la \
$(NULL)
......@@ -10,3 +10,5 @@ SOURCES_mux_ts = ts.c \
csa.h \
bits.h \
$(NULL)
libvlc_LTLIBRARIES += libmux_ps_plugin.la
......@@ -4,3 +4,13 @@ SOURCES_packetizer_mpeg4video = mpeg4video.c
SOURCES_packetizer_mpeg4audio = mpeg4audio.c
SOURCES_packetizer_h264 = h264.c
SOURCES_packetizer_vc1 = vc1.c
libvlc_LTLIBRARIES += \
libpacketizer_mpegvideo_plugin.la \
libpacketizer_mpeg4video_plugin.la \
libpacketizer_mpeg4audio_plugin.la \
libpacketizer_h264_plugin.la \
libpacketizer_vc1_plugin.la
if ENABLE_SOUT
libvlc_LTLIBRARIES += libpacketizer_copy_plugin.la
endif
......@@ -11,3 +11,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
libvlc_LTLIBRARIES += \
libstream_out_dummy_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 \
libstream_out_gather_plugin.la \
libstream_out_rtp_plugin.la \
libstream_out_bridge_plugin.la \
libstream_out_mosaic_bridge_plugin.la \
libstream_out_autodel_plugin.la \
$(NULL)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment