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

[rbultje]

Author: rbultje
Date: Sat Feb 20 00:13:21 2010
New Revision: 21913

Log:
Only send out NAT-punching RTP/RTCP packets when we're in demuxer mode, i.e.
don't send them when acting as a RTSP muxer.

Patch by Martin Storsj? <$firstname $firstname st>.

Modified:
   trunk/libavformat/rtsp.c

Modified: trunk/libavformat/rtsp.c
==============================================================================
--- trunk/libavformat/rtsp.c	Sat Feb 20 00:11:59 2010	(r21912)
+++ trunk/libavformat/rtsp.c	Sat Feb 20 00:13:21 2010	(r21913)
@@ -1177,7 +1177,7 @@ static int make_setup_request(AVFormatCo
              * potential NAT router by sending dummy packets.
              * RTP/RTCP dummy packets are used for RDT, too.
              */
-            if (!(rt->server_type == RTSP_SERVER_WMS && i > 1))
+            if (!(rt->server_type == RTSP_SERVER_WMS && i > 1) && s->iformat)
                 rtp_send_punch_packets(rtsp_st->rtp_handle);
             break;
         }