summaryrefslogtreecommitdiff
path: root/libavformat/rtsp.c
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2011-01-10 12:45:24 +0200
committerJanne Grunau <janne-ffmpeg@jannau.net>2011-01-24 22:49:36 +0100
commit2762a7a28b261a505a9002b92d4f7c04eeaacc1b (patch)
tree51a37efaa522715ea75a6597b8e0dfa1de816f1f /libavformat/rtsp.c
parente836b1b0859798488d8ba45a837dc27bac2ee99f (diff)
rtspdec: Retry with TCP if UDP failed
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
Diffstat (limited to 'libavformat/rtsp.c')
-rw-r--r--libavformat/rtsp.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
index dddaaf4237..ca9ce7cf21 100644
--- a/libavformat/rtsp.c
+++ b/libavformat/rtsp.c
@@ -1291,7 +1291,7 @@ int ff_rtsp_connect(AVFormatContext *s)
int port, err, tcp_fd;
RTSPMessageHeader reply1 = {0}, *reply = &reply1;
int lower_transport_mask = 0;
- char real_challenge[64];
+ char real_challenge[64] = "";
struct sockaddr_storage peer;
socklen_t peer_len = sizeof(peer);
@@ -1515,6 +1515,8 @@ redirect:
}
} while (err);
+ rt->lower_transport_mask = lower_transport_mask;
+ av_strlcpy(rt->real_challenge, real_challenge, sizeof(rt->real_challenge));
rt->state = RTSP_STATE_IDLE;
rt->seek_timestamp = 0; /* default is to start stream at position zero */
return 0;