diff options
Diffstat (limited to 'libmpdemux')
-rw-r--r-- | libmpdemux/demux_nemesi.c | 12 | ||||
-rw-r--r-- | libmpdemux/demux_nemesi.h | 46 |
2 files changed, 7 insertions, 51 deletions
diff --git a/libmpdemux/demux_nemesi.c b/libmpdemux/demux_nemesi.c index 1af3bb4f86..bf72e517c9 100644 --- a/libmpdemux/demux_nemesi.c +++ b/libmpdemux/demux_nemesi.c @@ -15,8 +15,10 @@ * along with MPlayer; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - -#include "demux_nemesi.h" +#include <stdlib.h> +#include <stdio.h> +#include "stream/stream.h" +#include "demuxer.h" #include "stheader.h" #define HAVE_STRUCT_SOCKADDR_STORAGE #include "nemesi/rtsp.h" @@ -135,7 +137,7 @@ static void link_session_and_fetch_conf(Nemesi_DemuxerStreamData * ndsd, } } -demuxer_t* demux_open_rtp(demuxer_t* demuxer) +static demuxer_t* demux_open_rtp(demuxer_t* demuxer) { nms_rtsp_hints hints; char * url = demuxer->stream->streaming_ctrl->url->url; @@ -330,7 +332,7 @@ static void stream_add_packet(Nemesi_DemuxerStreamData * ndsd, ds_add_packet(ds, dp); } -int demux_rtp_fill_buffer(demuxer_t* demuxer, demux_stream_t* ds) +static int demux_rtp_fill_buffer(demuxer_t* demuxer, demux_stream_t* ds) { Nemesi_DemuxerStreamData * ndsd = demuxer->priv; Nemesi_SessionType stype; @@ -372,7 +374,7 @@ int demux_rtp_fill_buffer(demuxer_t* demuxer, demux_stream_t* ds) } -void demux_close_rtp(demuxer_t* demuxer) +static void demux_close_rtp(demuxer_t* demuxer) { Nemesi_DemuxerStreamData * ndsd = demuxer->priv; rtsp_ctrl * ctl = ndsd->rtsp; diff --git a/libmpdemux/demux_nemesi.h b/libmpdemux/demux_nemesi.h deleted file mode 100644 index e5f129b4c0..0000000000 --- a/libmpdemux/demux_nemesi.h +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright (C) 2007 Alessandro Molina <amol.wrk@gmail.com> - * based on previous Live555 RTP support. - * - * 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 - */ - - -#ifndef DEMUX_NEMESI_H -#define DEMUX_NEMESI_H - -#include <stdlib.h> -#include <stdio.h> -#include "stream/stream.h" -#include "demuxer.h" - - -/** - * Open the RTP demuxer - */ -demuxer_t* demux_open_rtp(demuxer_t* demuxer); - -/** - * Read from the RTP demuxer - */ -int demux_rtp_fill_buffer(demuxer_t *demux, demux_stream_t* ds); - -/** - * Close the RTP demuxer - */ -void demux_close_rtp(demuxer_t* demuxer); - -#endif /* DEMUX_NEMESI_H */ - |