aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2010-02-19 23:13:21 +0000
committerRonald S. Bultje <rsbultje@gmail.com>2010-02-19 23:13:21 +0000
commit30ff7c5cbc12b692eca5c138c8a3d626c55364af (patch)
tree34e2484684cd1c8a22c5d07e1917e280e352c544
parent69adcc4ffb748d732acc8462890e50969d7e770c (diff)
downloadffmpeg-30ff7c5cbc12b692eca5c138c8a3d626c55364af.tar.gz
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>. Originally committed as revision 21913 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavformat/rtsp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
index d16a9bddb9..0bba88a8ea 100644
--- a/libavformat/rtsp.c
+++ b/libavformat/rtsp.c
@@ -1177,7 +1177,7 @@ static int make_setup_request(AVFormatContext *s, const char *host, int port,
* 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;
}