diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-23 21:39:29 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-23 21:43:18 +0100 |
| commit | 83f18410bdcf149b58fb669cda65b1cdcdebf695 (patch) | |
| tree | fe767f6d5f7e1961d5b36b74ebc4caf8920083eb /libavformat/rtsp.c | |
| parent | cce8f750d91c013da00f5191ad537450172acc0c (diff) | |
| parent | cdcc370293a159c321e41af7f0eef141c62d698d (diff) | |
| download | ffmpeg-83f18410bdcf149b58fb669cda65b1cdcdebf695.tar.gz | |
Merge commit 'cdcc370293a159c321e41af7f0eef141c62d698d'
* commit 'cdcc370293a159c321e41af7f0eef141c62d698d':
rtsp: punch holes again after pause
See: 22bb5bd7a3b55c25bfef130ad89e8574dd47af1d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtsp.c')
| -rw-r--r-- | libavformat/rtsp.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index 2197671782..6fd34cde73 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -1539,13 +1539,6 @@ int ff_rtsp_make_setup_request(AVFormatContext *s, const char *host, int port, err = AVERROR_INVALIDDATA; goto fail; } - /* Try to initialize the connection state in a - * potential NAT router by sending dummy packets. - * RTP/RTCP dummy packets are used for RDT, too. - */ - if (CONFIG_RTPDEC && - !(rt->server_type == RTSP_SERVER_WMS && i > 1) && s->iformat) - ff_rtp_send_punch_packets(rtsp_st->rtp_handle); break; } case RTSP_LOWER_TRANSPORT_UDP_MULTICAST: { |