[FFmpeg-cvslog] r21461 - trunk/libavformat/rtsp.c

rbultje subversion
Tue Jan 26 16:51:54 CET 2010


Author: rbultje
Date: Tue Jan 26 16:51:54 2010
New Revision: 21461

Log:
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>.

Modified:
   trunk/libavformat/rtsp.c

Modified: trunk/libavformat/rtsp.c
==============================================================================
--- trunk/libavformat/rtsp.c	Tue Jan 26 16:34:21 2010	(r21460)
+++ trunk/libavformat/rtsp.c	Tue Jan 26 16:51:54 2010	(r21461)
@@ -1457,7 +1457,7 @@ static int udp_read_packet(AVFormatConte
                 }
             }
 #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);



More information about the ffmpeg-cvslog mailing list