rtpproto: Move rtpproto specific function declarations to a separate header

Mixing these with the rtp depacketizer functions in rtpdec.h is no good.

Martin Storsjö committed 13 years ago

Commit b7e6da91 parent 892b0be6 files · +36 −5Browse files

Unified · Split

6 files

@@ -32,6 +32,7 @@ · 31 unmodified lines
32	#include "libavformat/network.h"	32	#include "libavformat/network.h"
33	#include "libavformat/os_support.h"	33	#include "libavformat/os_support.h"
34	#include "libavformat/rtpdec.h"	34	#include "libavformat/rtpdec.h"
		35	#include "libavformat/rtpproto.h"
35	#include "libavformat/rtsp.h"	36	#include "libavformat/rtsp.h"
36	#include "libavformat/avio_internal.h"	37	#include "libavformat/avio_internal.h"
37	#include "libavformat/internal.h"	38	#include "libavformat/internal.h"

 void ff_rtp_parse_close(RTPDemuxContext *s);
 int64_t ff_rtp_queued_packet_time(RTPDemuxContext *s);
 void ff_rtp_reset_packet_queue(RTPDemuxContext *s);
-int ff_rtp_get_local_rtp_port(URLContext *h);
-int ff_rtp_get_local_rtcp_port(URLContext *h);
-int ff_rtp_set_remote_url(URLContext *h, const char *uri);
 /**
  * Send a dummy packet on both port pairs to set up the connection

@@ -28,7 +28,8 @@ · 27 unmodified lines
28	#include "libavutil/avstring.h"	28	#include "libavutil/avstring.h"
29	#include "avformat.h"	29	#include "avformat.h"
30	#include "avio_internal.h"	30	#include "avio_internal.h"
31	#include "rtpdec.h"	31	#include "rtp.h"
		32	#include "rtpproto.h"
32	#include "url.h"	33	#include "url.h"
33		34
34	#include <stdarg.h>	35	#include <stdarg.h>

@@ -0,0 +1,31 @@
	1	/*
	2	* RTP network protocol
	3	*
	4	* This file is part of Libav.
	5	*
	6	* Libav is free software; you can redistribute it and/or
	7	* modify it under the terms of the GNU Lesser General Public
	8	* License as published by the Free Software Foundation; either
	9	* version 2.1 of the License, or (at your option) any later version.
	10	*
	11	* Libav is distributed in the hope that it will be useful,
	12	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	13	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	14	* Lesser General Public License for more details.
	15	*
	16	* You should have received a copy of the GNU Lesser General Public
	17	* License along with Libav; if not, write to the Free Software
	18	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
	19	*/
	20
	21	#ifndef AVFORMAT_RTPPROTO_H
	22	#define AVFORMAT_RTPPROTO_H
	23
	24	#include "url.h"
	25
	26	int ff_rtp_set_remote_url(URLContext h, const char uri);
	27
	28	int ff_rtp_get_local_rtp_port(URLContext *h);
	29	int ff_rtp_get_local_rtcp_port(URLContext *h);
	30
	31	#endif /* AVFORMAT_RTPPROTO_H */

Keyboard shortcuts