diff options
| author | wm4 <wm4@nowhere> | 2012-08-18 10:37:34 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2012-08-20 15:36:03 +0200 |
| commit | 3a5d5f01d4d8d7beb53c3288d72db20f2ad0b141 (patch) | |
| tree | 4b07874ce53c81de4fb74c77c9859def23f62ac6 /cfg-mplayer.h | |
| parent | 8ca3ec1562986c0681261cad407e05578eda45fd (diff) | |
| download | mpv-3a5d5f01d4d8d7beb53c3288d72db20f2ad0b141.tar.bz2 mpv-3a5d5f01d4d8d7beb53c3288d72db20f2ad0b141.tar.xz | |
Remove support for LIVE555 RTSP streaming
The main excuse for removing this is that LIVE555 deprecated the API
the mplayer implementation was using. The old API still seems to be
somewhat supported, but must be explicitly enabled at LIVE555
compilation, so mplayer won't always work on any user installation.
The implementation was also very messy, in C++, and FFmpeg support is
available as alternative.
Remove it completely.
Diffstat (limited to 'cfg-mplayer.h')
| -rw-r--r-- | cfg-mplayer.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/cfg-mplayer.h b/cfg-mplayer.h index 7d26316ac5..ed788aab9a 100644 --- a/cfg-mplayer.h +++ b/cfg-mplayer.h @@ -382,13 +382,10 @@ const m_option_t common_opts[] = { #endif /* HAVE_AF_INET6 */ #endif /* CONFIG_NETWORKING */ -#ifdef CONFIG_LIVE555 - {"rtsp-stream-over-http", &rtsp_transport_http, CONF_TYPE_FLAG, 0, 0, 1, NULL}, -#endif /* CONFIG_LIVE555 */ -#if defined(CONFIG_LIBNEMESI) || defined(CONFIG_LIVE555) +#if defined(CONFIG_LIBNEMESI) // -rtsp-stream-over-tcp option, specifying TCP streaming of RTP/RTCP {"rtsp-stream-over-tcp", &rtsp_transport_tcp, CONF_TYPE_FLAG, 0, 0, 1, NULL}, -#endif /* defined(CONFIG_LIBNEMESI) || defined(CONFIG_LIVE555) */ +#endif /* defined(CONFIG_LIBNEMESI) */ #ifdef CONFIG_LIBNEMESI {"rtsp-stream-over-sctp", &rtsp_transport_sctp, CONF_TYPE_FLAG, 0, 0, 1, NULL}, #endif /* CONFIG_LIBNEMESI */ |