[SCM] libav/experimental: 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.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 30ff7c5cbc12b692eca5c138c8a3d626c55364af
Author: Martin Storsjö <martin at martin.st>
Date:   Fri Feb 19 23:13:21 2010 +0000

    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

diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
index d16a9bd..0bba88a 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;
         }

-- 
Libav/FFmpeg packaging