Browse code

Merge commit 'b7e6da988bfd5def40ccf3476eb8ce2f98a969a5'

* commit 'b7e6da988bfd5def40ccf3476eb8ce2f98a969a5':
rtpproto: Move rtpproto specific function declarations to a separate header

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Michael Niedermayer authored on 2013/08/01 19:02:33
Showing 6 changed files
... ...
@@ -36,6 +36,7 @@
36 36
 #include "libavformat/network.h"
37 37
 #include "libavformat/os_support.h"
38 38
 #include "libavformat/rtpdec.h"
39
+#include "libavformat/rtpproto.h"
39 40
 #include "libavformat/rtsp.h"
40 41
 #include "libavformat/avio_internal.h"
41 42
 #include "libavformat/internal.h"
... ...
@@ -51,10 +51,6 @@ int ff_rtp_parse_packet(RTPDemuxContext *s, AVPacket *pkt,
51 51
 void ff_rtp_parse_close(RTPDemuxContext *s);
52 52
 int64_t ff_rtp_queued_packet_time(RTPDemuxContext *s);
53 53
 void ff_rtp_reset_packet_queue(RTPDemuxContext *s);
54
-int ff_rtp_get_local_rtp_port(URLContext *h);
55
-int ff_rtp_get_local_rtcp_port(URLContext *h);
56
-
57
-int ff_rtp_set_remote_url(URLContext *h, const char *uri);
58 54
 
59 55
 /**
60 56
  * Send a dummy packet on both port pairs to set up the connection
... ...
@@ -28,7 +28,8 @@
28 28
 #include "libavutil/avstring.h"
29 29
 #include "avformat.h"
30 30
 #include "avio_internal.h"
31
-#include "rtpdec.h"
31
+#include "rtp.h"
32
+#include "rtpproto.h"
32 33
 #include "url.h"
33 34
 
34 35
 #include <stdarg.h>
35 36
new file mode 100644
... ...
@@ -0,0 +1,31 @@
0
+/*
1
+ * RTP network protocol
2
+ *
3
+ * This file is part of FFmpeg.
4
+ *
5
+ * FFmpeg is free software; you can redistribute it and/or
6
+ * modify it under the terms of the GNU Lesser General Public
7
+ * License as published by the Free Software Foundation; either
8
+ * version 2.1 of the License, or (at your option) any later version.
9
+ *
10
+ * FFmpeg is distributed in the hope that it will be useful,
11
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
12
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
13
+ * Lesser General Public License for more details.
14
+ *
15
+ * You should have received a copy of the GNU Lesser General Public
16
+ * License along with FFmpeg; if not, write to the Free Software
17
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
18
+ */
19
+
20
+#ifndef AVFORMAT_RTPPROTO_H
21
+#define AVFORMAT_RTPPROTO_H
22
+
23
+#include "url.h"
24
+
25
+int ff_rtp_set_remote_url(URLContext *h, const char *uri);
26
+
27
+int ff_rtp_get_local_rtp_port(URLContext *h);
28
+int ff_rtp_get_local_rtcp_port(URLContext *h);
29
+
30
+#endif /* AVFORMAT_RTPPROTO_H */
... ...
@@ -42,6 +42,7 @@
42 42
 #include "rtsp.h"
43 43
 
44 44
 #include "rtpdec.h"
45
+#include "rtpproto.h"
45 46
 #include "rdt.h"
46 47
 #include "rtpdec_formats.h"
47 48
 #include "rtpenc_chain.h"
... ...
@@ -29,6 +29,7 @@
29 29
 #include "internal.h"
30 30
 #include "network.h"
31 31
 #include "os_support.h"
32
+#include "rtpproto.h"
32 33
 #include "rtsp.h"
33 34
 #include "rdt.h"
34 35
 #include "url.h"