# HG changeset patch # User lu_zero # Date 1196773908 0 # Node ID f7fa01fe18c831f1fb585d2668ac61393e00f69e # Parent 239330301b33d3b159e1e46423e2ea052b38e489 Remove non necessary header diff -r 239330301b33 -r f7fa01fe18c8 libmpdemux/demux_nemesi.c --- a/libmpdemux/demux_nemesi.c Tue Dec 04 13:05:25 2007 +0000 +++ b/libmpdemux/demux_nemesi.c Tue Dec 04 13:11:48 2007 +0000 @@ -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 +#include +#include "stream/stream.h" +#include "demuxer.h" #include "stheader.h" #define HAVE_STRUCT_SOCKADDR_STORAGE #include "nemesi/rtsp.h" @@ -135,7 +137,7 @@ } } -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 @@ 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 @@ } -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 -r 239330301b33 -r f7fa01fe18c8 libmpdemux/demux_nemesi.h --- a/libmpdemux/demux_nemesi.h Tue Dec 04 13:05:25 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,46 +0,0 @@ -/* - * Copyright (C) 2007 Alessandro Molina - * 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 -#include -#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 */ -