diff options
| author | Diego Biurrun <diego@biurrun.de> | 2011-07-17 13:27:27 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2011-07-18 18:22:02 +0200 |
| commit | 76e25dbca6eb6ea899baa042902bd038bd2e3056 (patch) | |
| tree | 5db14ef7ee802239fbfb0dbd55c51a8dd051ed45 | |
| parent | e463f0e9790b4ee00b1a0572e5de600476ee0618 (diff) | |
| download | ffmpeg-76e25dbca6eb6ea899baa042902bd038bd2e3056.tar.gz | |
rtsp: remove disabled code
| -rw-r--r-- | libavformat/rtsp.c | 8 | ||||
| -rw-r--r-- | libavformat/rtsp.h | 3 | ||||
| -rw-r--r-- | libavformat/rtspdec.c | 6 |
3 files changed, 0 insertions, 17 deletions
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index 949c174070..8b70c8b28a 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); diff --git a/libavformat/rtsp.h b/libavformat/rtsp.h index 372ed96e6f..265d9f837f 100644 --- a/libavformat/rtsp.h +++ b/libavformat/rtsp.h @@ -220,9 +220,6 @@ typedef struct RTSPState { * see rtsp_read_play() and rtsp_read_seek(). */ int64_t seek_timestamp; - /* XXX: currently we use unbuffered input */ - // AVIOContext rtsp_gb; - int seq; /**< RTSP command sequence number */ /** copy of RTSPMessageHeader->session_id, i.e. the server-provided session diff --git a/libavformat/rtspdec.c b/libavformat/rtspdec.c index d154615d6f..430c086544 100644 --- a/libavformat/rtspdec.c +++ b/libavformat/rtspdec.c @@ -383,12 +383,6 @@ static int rtsp_read_close(AVFormatContext *s) { RTSPState *rt = s->priv_data; -#if 0 - /* NOTE: it is valid to flush the buffer here */ - if (rt->lower_transport == RTSP_LOWER_TRANSPORT_TCP) { - avio_close(&rt->rtsp_gb); - } -#endif ff_rtsp_send_cmd_async(s, "TEARDOWN", rt->control_uri, NULL); ff_rtsp_close_streams(s); |