From e181547db10c48a92b6c4d891c184b416ebe2add Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 18 Aug 2012 10:50:14 +0200 Subject: Remove support for libnemesi RTSP streaming Removed due to being a maintainance burden. Support for FFmpeg is available. --- stream/stream.c | 4 --- stream/stream_nemesi.c | 79 -------------------------------------------------- 2 files changed, 83 deletions(-) delete mode 100644 stream/stream_nemesi.c (limited to 'stream') diff --git a/stream/stream.c b/stream/stream.c index 9fab0443e6..d7500cc790 100644 --- a/stream/stream.c +++ b/stream/stream.c @@ -61,7 +61,6 @@ extern const stream_info_t stream_info_vcd; extern const stream_info_t stream_info_cdda; extern const stream_info_t stream_info_netstream; extern const stream_info_t stream_info_asf; -extern const stream_info_t stream_info_rtsp; extern const stream_info_t stream_info_udp; extern const stream_info_t stream_info_http1; extern const stream_info_t stream_info_http2; @@ -92,9 +91,6 @@ static const stream_info_t* const auto_open_streams[] = { &stream_info_netstream, &stream_info_http1, &stream_info_asf, -#ifdef CONFIG_LIBNEMESI - &stream_info_rtsp, -#endif &stream_info_udp, &stream_info_http2, #endif diff --git a/stream/stream_nemesi.c b/stream/stream_nemesi.c deleted file mode 100644 index 7cc4ccafa5..0000000000 --- a/stream/stream_nemesi.c +++ /dev/null @@ -1,79 +0,0 @@ -/* - * based on previous RTSP support from Benjamin Zores. - * - * Copyright (C) 2007 Alessandro Molina - * - * This file is part of MPlayer. - * - * MPlayer is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * MPlayer is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with MPlayer; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#define HAVE_STRUCT_SOCKADDR_STORAGE - -#include -#include -#include -#include -#include -#include "config.h" -#include "nemesi/rtsp.h" - -#include - -#include "stream.h" -#include "libmpdemux/demuxer.h" - -#include "tcp.h" - -extern int network_bandwidth; -char *rtsp_destination = NULL; - -static int rtsp_streaming_seek(int fd, off_t pos, - streaming_ctrl_t* streaming_ctrl) { - return -1; -} - -static int rtsp_streaming_open (stream_t *stream, int mode, void *opts, - int *file_format) -{ - rtsp_ctrl * ctl; - URL_t *url; - stream->fd = -1; - - mp_msg (MSGT_OPEN, MSGL_V, "STREAM_RTSP, URL: %s\n", stream->url); - stream->streaming_ctrl = streaming_ctrl_new (); - if (!stream->streaming_ctrl) - return STREAM_ERROR; - - stream->streaming_ctrl->bandwidth = network_bandwidth; - url = url_new(stream->url); - stream->streaming_ctrl->url = check4proxies(url); - stream->streaming_ctrl->streaming_seek = rtsp_streaming_seek; - - *file_format = DEMUXER_TYPE_RTP_NEMESI; - stream->type = STREAMTYPE_STREAM; - return STREAM_OK; -} - -const stream_info_t stream_info_rtsp = { - "RTSP streaming", - "rtsp", - "Alessandro Molina", - "implemented over libnemesi", - rtsp_streaming_open, - {"rtsp", NULL}, - NULL, - 0 /* Urls are an option string */ -}; -- cgit v1.2.3