diff options
| author | Martin Storsjö <martin@martin.st> | 2010-03-23 08:00:37 +0000 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2010-03-23 08:00:37 +0000 |
| commit | 7a033e08eace53d78ceb13d6b909bcb0d4b2a84e (patch) | |
| tree | 92eeec9bdbf5a0bb6bcd49892cda850f681ddae8 /libavformat | |
| parent | 602eb77975fa10b08ea283288b988b07bd383a10 (diff) | |
| download | ffmpeg-7a033e08eace53d78ceb13d6b909bcb0d4b2a84e.tar.gz | |
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
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/rtsp.c | 6 |
1 files 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. */ |