[FFmpeg-cvslog] rtsp: Use GET_PARAMETER for keep-alive for generic RTSP servers

[Martin Storsjö]

ffmpeg | branch: master | Martin Storsjö <martin at martin.st> | Wed Mar 30 23:35:28 2011 +0300| [229e2631be528c595650a7568c1d4df8af9c4944] | committer: Luca Barbato

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 at gentoo.org>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=229e2631be528c595650a7568c1d4df8af9c4944
---

 libavformat/rtspdec.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libavformat/rtspdec.c b/libavformat/rtspdec.c
index 571e76d..e2ba76e 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);