diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-07-19 18:45:47 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-07-19 18:46:04 +0200 |
| commit | d303e0affd9274381a098da55ef4eca954f23b74 (patch) | |
| tree | 00a54bf98aa0c13c3689ec694b07e50a21102951 /libavformat/rtsp.c | |
| parent | 257f274dfa000ae0add4aef8bd11375c8d32add0 (diff) | |
| parent | 3e9409b1d0ca6ee7063fa04d940af36a20b46a8b (diff) | |
| download | ffmpeg-d303e0affd9274381a098da55ef4eca954f23b74.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
simple_idct: simplify some ifdeffery
simple_idct: remove code for DCTELEM != int16
Remove VLAs in ff_amrwb_lsp2lpc()
fate: make vsynth tests depend on only the relevant vref
rtsp: remove disabled code
dsputil: restore mistakenly removed hunk of disabled code
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtsp.c')
| -rw-r--r-- | libavformat/rtsp.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index 46d63f70bc..3b410a3043 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -1116,17 +1116,9 @@ int ff_rtsp_make_setup_request(AVFormatContext *s, const char *host, int port, } } -#if 0 - /* then try on any port */ - if (ffurl_open(&rtsp_st->rtp_handle, "rtp://", AVIO_FLAG_READ) < 0) { - err = AVERROR_INVALIDDATA; - goto fail; - } -#else av_log(s, AV_LOG_ERROR, "Unable to open an input RTP port\n"); err = AVERROR(EIO); goto fail; -#endif rtp_opened: port = rtp_get_local_rtp_port(rtsp_st->rtp_handle); |