summaryrefslogtreecommitdiff
path: root/libavformat/rtsp.c
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2011-01-02 10:06:21 +0000
committerMartin Storsjö <martin@martin.st>2011-01-02 10:06:21 +0000
commit3df54c6bf2e5bc03b2dedcd60006d8f1df204ea3 (patch)
tree34b8c0bebf53cbe1e0c5797174081e0daecba9ef /libavformat/rtsp.c
parent7f8ffc4efddf796aa3aa8174fb008007cb8f8c1c (diff)
rtsp: Add a method parameter to ff_rtsp_read_reply
Originally committed as revision 26189 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/rtsp.c')
-rw-r--r--libavformat/rtsp.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
index ca84e5df2b..a87190b23d 100644
--- a/libavformat/rtsp.c
+++ b/libavformat/rtsp.c
@@ -758,7 +758,7 @@ void ff_rtsp_skip_packet(AVFormatContext *s)
int ff_rtsp_read_reply(AVFormatContext *s, RTSPMessageHeader *reply,
unsigned char **content_ptr,
- int return_on_interleaved_data)
+ int return_on_interleaved_data, const char *method)
{
RTSPState *rt = s->priv_data;
char buf[4096], buf1[1024], *q;
@@ -936,7 +936,7 @@ retry:
send_content_length)))
return ret;
- if ((ret = ff_rtsp_read_reply(s, reply, content_ptr, 0) ) < 0)
+ if ((ret = ff_rtsp_read_reply(s, reply, content_ptr, 0, method) ) < 0)
return ret;
if (reply->status_code == 401 && cur_auth_type == HTTP_AUTH_NONE &&
@@ -1512,7 +1512,7 @@ static int udp_read_packet(AVFormatContext *s, RTSPStream **prtsp_st,
if (tcp_fd != -1 && FD_ISSET(tcp_fd, &rfds)) {
RTSPMessageHeader reply;
- ret = ff_rtsp_read_reply(s, &reply, NULL, 0);
+ ret = ff_rtsp_read_reply(s, &reply, NULL, 0, NULL);
if (ret < 0)
return ret;
/* XXX: parse message */