From 7a033e08eace53d78ceb13d6b909bcb0d4b2a84e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Martin=20Storsj=C3=B6?= Date: Tue, 23 Mar 2010 08:00:37 +0000 Subject: [PATCH] Handle multiple RTSP transport options properly by adding all of them into the mask Originally committed as revision 22644 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/rtsp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index 63103d0326..12faf980f8 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -1463,11 +1463,11 @@ redirect: /* handle the options */ if (!strcmp(option, "udp")) { - lower_transport_mask = (1<< RTSP_LOWER_TRANSPORT_UDP); + lower_transport_mask |= (1<< RTSP_LOWER_TRANSPORT_UDP); } else if (!strcmp(option, "multicast")) { - lower_transport_mask = (1<< RTSP_LOWER_TRANSPORT_UDP_MULTICAST); + lower_transport_mask |= (1<< RTSP_LOWER_TRANSPORT_UDP_MULTICAST); } else if (!strcmp(option, "tcp")) { - lower_transport_mask = (1<< RTSP_LOWER_TRANSPORT_TCP); + lower_transport_mask |= (1<< RTSP_LOWER_TRANSPORT_TCP); } else { /* Write options back into the buffer, using memmove instead * of strcpy since the strings may overlap. */ -- 2.11.0