diff options
| author | Martin Storsjö <martin@martin.st> | 2011-03-30 23:35:28 +0300 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2011-03-30 22:44:07 +0200 |
| commit | 229e2631be528c595650a7568c1d4df8af9c4944 (patch) | |
| tree | 08dbb3579b7a2e8b01c6ffcdb65a4d58d63dfe5f | |
| parent | 4b6f097b21d29ac11dd587038b0d385dbbed1c24 (diff) | |
| download | ffmpeg-229e2631be528c595650a7568c1d4df8af9c4944.tar.gz | |
rtsp: Use GET_PARAMETER for keep-alive for generic RTSP servers
According to the RFC, GET_PARAMETER should be used for
this, and according to a report from Tim Ouellette,
OPTIONS doesn't work for keeping the connection alive for some
servers. Also, live555 uses GET_PARAMETER for this purpose.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| -rw-r--r-- | libavformat/rtspdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/rtspdec.c b/libavformat/rtspdec.c index 571e76dfa9..e2ba76e636 100644 --- a/libavformat/rtspdec.c +++ b/libavformat/rtspdec.c @@ -340,7 +340,7 @@ retry: /* send dummy request to keep TCP connection alive */ if ((av_gettime() - rt->last_cmd_time) / 1000000 >= rt->timeout / 2) { - if (rt->server_type == RTSP_SERVER_WMS) { + if (rt->server_type != RTSP_SERVER_REAL) { ff_rtsp_send_cmd_async(s, "GET_PARAMETER", rt->control_uri, NULL); } else { ff_rtsp_send_cmd_async(s, "OPTIONS", "*", NULL); |