summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorJeremy Morton <ffmpeg@game-point.net>2010-01-26 15:51:54 +0000
committerRonald S. Bultje <rsbultje@gmail.com>2010-01-26 15:51:54 +0000
commit27000636556d8fb81a57e9eae71c79637959ced6 (patch)
treeb66514f518a579d8b6678cdd3b12c3503634390f /libavformat
parent6548c939ec6f0e385bbaac4d86ed2d9906744839 (diff)
Don't use tcp_fd if we're not using TCP-based connections (e.g. when
reading direct SDP files to set up UDP-based RTP-streams). Fixes issue 1713. Patch by Jeremy Morton <ffmpeg game-point net>. Originally committed as revision 21461 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/rtsp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
index c9fb0974ba..d1738dd046 100644
--- a/libavformat/rtsp.c
+++ b/libavformat/rtsp.c
@@ -1457,7 +1457,7 @@ static int udp_read_packet(AVFormatContext *s, RTSPStream **prtsp_st,
}
}
#if CONFIG_RTSP_DEMUXER
- if (FD_ISSET(tcp_fd, &rfds)) {
+ if (tcp_fd != -1 && FD_ISSET(tcp_fd, &rfds)) {
RTSPMessageHeader reply;
rtsp_read_reply(s, &reply, NULL, 0);