Remove unmaintained switcher module

NEWS

@@ -89,6 +89,7 @@ Stream Output:
  * Livehttp places more accurate segments durations in playlist
  * Livehttp allows setting cachin-variable in playlist
  * Livehttp stream encryption support
+ * Unmaintained switcher has been removed
 
 Interfaces:
  * configurable password for the HTTP server.

configure.ac

@@ -2390,21 +2390,6 @@ AS_IF([test "${enable_vda}" != "no"], [
 ])
 AM_CONDITIONAL([HAVE_AVCODEC_VDA], [test "${have_avcodec_vda}" = "yes"])
 
-dnl
-dnl stream_out switcher needs libavcodec
-dnl
-AC_ARG_ENABLE(switcher,
-  [  --enable-switcher       Stream-out switcher plugin (default disabled)])
-AS_IF([test "${enable_switcher}" = "yes"], [
-  AS_IF([test "x${have_avcodec}" = "xyes"], [
-    VLC_ADD_PLUGIN([stream_out_switcher])
-    VLC_ADD_LIBS([stream_out_switcher],[$AVCODEC_LIBS $AVUTIL_LIBS $LIBM])
-    VLC_ADD_CFLAGS([stream_out_switcher],[$AVCODEC_CFLAGS $AVUTIL_CFLAGS])
-  ],[AC_MSG_ERROR([Stream_out switcher depends on avcodec])
-  ])
-])
-
-
 dnl
 dnl  avformat demuxer/muxer plugin
 dnl

extras/package/rpm/vlc.altlinux.spec

@@ -1175,7 +1175,6 @@ strfile %buildroot%_gamesdatadir/fortune/vlc %buildroot%_gamesdatadir/fortune/vl
 %_vlc_pluginsdir/stream_out/libstream_out_gather_plugin.so*
 %_vlc_pluginsdir/stream_out/libstream_out_mosaic_bridge_plugin.so*
 %_vlc_pluginsdir/stream_out/libstream_out_rtp_plugin.so*
-#%_vlc_pluginsdir/stream_out/libstream_out_switcher_plugin.so*
 %_vlc_pluginsdir/stream_out/libstream_out_transcode_plugin.so*
 %_vlc_pluginsdir/stream_out/libstream_out_autodel_plugin.so*
 
@@ -1374,7 +1373,6 @@ strfile %buildroot%_gamesdatadir/fortune/vlc %buildroot%_gamesdatadir/fortune/vl
 
 %files plugin-ffmpeg
 %_vlc_pluginsdir/codec/libffmpeg_plugin.so*
-#%_vlc_pluginsdir/stream_out/libstream_out_switcher_plugin.so*
 
 %files plugin-framebuffer
 %_vlc_pluginsdir/video_output/libfb_plugin.so*

modules/LIST

@@ -328,7 +328,6 @@ $Id$
  * stream_out_setid: Set the ID/Lang of an ES when streaming
  * stream_out_smem: stream output module to a memory buffer
  * stream_out_standard: standard stream output module
- * stream_out_switcher: stream output module to display backgrounds
  * stream_out_transcode: audio & video transcoder
  * subsdec: a codec to output textual subtitles
  * subsdelay: subtitles delay filter

modules/stream_out/Modules.am

@@ -6,8 +6,6 @@ SOURCES_stream_out_duplicate = duplicate.c
 SOURCES_stream_out_es = es.c
 SOURCES_stream_out_display = display.c
 SOURCES_stream_out_gather = gather.c
-SOURCES_stream_out_switcher = switcher.c ../codec/avcodec/cpu.c \
-	../codec/avcodec/avcommon_compat.h ../codec/avcodec/avcommon.h
 SOURCES_stream_out_bridge = bridge.c
 SOURCES_stream_out_mosaic_bridge = mosaic_bridge.c
 SOURCES_stream_out_autodel = autodel.c

po/POTFILES.in

@@ -1014,7 +1014,6 @@ modules/stream_out/rtsp.c
 modules/stream_out/setid.c
 modules/stream_out/smem.c
 modules/stream_out/standard.c
-modules/stream_out/switcher.c
 modules/stream_out/transcode/transcode.c
 modules/text_renderer/freetype.c
 modules/text_renderer/quartztext.c