virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

Make rtsp_skip_packet non-static, add ff prefix

Browse Source 
Originally committed as revision 22547 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Martin Storsjö
2010-03-15 16:31:15 +00:00
parent c040badb70
commit ec55edba31
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/rtsp.c
View File

@@ -861,7 +861,7 @@ void ff_rtsp_parse_line(RTSPMessageHeader *reply, const char *buf)
} }
/* skip a RTP/TCP interleaved packet */ /* 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; RTSPState *rt = s->priv_data;
int ret, len, len1; int ret, len, len1;
@@ -917,7 +917,7 @@ int ff_rtsp_read_reply(AVFormatContext *s, RTSPMessageHeader *reply,
if (return_on_interleaved_data) { if (return_on_interleaved_data) {
return 1; return 1;
} else } else
rtsp_skip_packet(s); ff_rtsp_skip_packet(s);
} else if (ch != '\r') { } else if (ch != '\r') {
if ((q - buf) < sizeof(buf) - 1) if ((q - buf) < sizeof(buf) - 1)
*q++ = ch; *q++ = ch;

5
libavformat/rtsp.h
View File

@@ -398,6 +398,11 @@ int ff_rtsp_read_reply(AVFormatContext *s, RTSPMessageHeader *reply,
unsigned char **content_ptr, unsigned char **content_ptr,
int return_on_interleaved_data); 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. * Connect to the RTSP server and set up the individual media streams.
* This can be used for both muxers and demuxers. * This can be used for both muxers and demuxers.