aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2010-03-15 16:31:15 +0000
committerMartin Storsjö <martin@martin.st>2010-03-15 16:31:15 +0000
commitec55edba312199245d7b830284b861673d27e999 (patch)
tree98917fc142ccd20b91da4827d06efc60a2f633c9
parentc040badb703e773a98f37392e9bc609e1a0b7439 (diff)
downloadffmpeg-ec55edba312199245d7b830284b861673d27e999.tar.gz
Make rtsp_skip_packet non-static, add ff prefix
Originally committed as revision 22547 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavformat/rtsp.c4
-rw-r--r--libavformat/rtsp.h5
2 files changed, 7 insertions, 2 deletions
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
index fafd27c056..a0e0b9e1a5 100644
--- a/libavformat/rtsp.c
+++ b/libavformat/rtsp.c
@@ -861,7 +861,7 @@ void ff_rtsp_parse_line(RTSPMessageHeader *reply, const char *buf)
}
/* skip a RTP/TCP interleaved packet */
-static void rtsp_skip_packet(AVFormatContext *s)
+void ff_rtsp_skip_packet(AVFormatContext *s)
{
RTSPState *rt = s->priv_data;
int ret, len, len1;
@@ -917,7 +917,7 @@ int ff_rtsp_read_reply(AVFormatContext *s, RTSPMessageHeader *reply,
if (return_on_interleaved_data) {
return 1;
} else
- rtsp_skip_packet(s);
+ ff_rtsp_skip_packet(s);
} else if (ch != '\r') {
if ((q - buf) < sizeof(buf) - 1)
*q++ = ch;
diff --git a/libavformat/rtsp.h b/libavformat/rtsp.h
index a322281282..13e251b72b 100644
--- a/libavformat/rtsp.h
+++ b/libavformat/rtsp.h
@@ -399,6 +399,11 @@ int ff_rtsp_read_reply(AVFormatContext *s, RTSPMessageHeader *reply,
int return_on_interleaved_data);
/**
+ * Skip a RTP/TCP interleaved packet.
+ */
+void ff_rtsp_skip_packet(AVFormatContext *s);
+
+/**
* Connect to the RTSP server and set up the individual media streams.
* This can be used for both muxers and demuxers.
*