Browse Source

rtsp: remove disabled code

tags/n0.9
Diego Biurrun 14 years ago
parent
commit
76e25dbca6
3 changed files with 0 additions and 17 deletions
  1. +0
    -8
      libavformat/rtsp.c
  2. +0
    -3
      libavformat/rtsp.h
  3. +0
    -6
      libavformat/rtspdec.c

+ 0
- 8
libavformat/rtsp.c View File

@@ -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);


+ 0
- 3
libavformat/rtsp.h View File

@@ -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


+ 0
- 6
libavformat/rtspdec.c View File

@@ -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);


Loading…
Cancel
Save