highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rtsp: remove disabled code

Browse Source
This commit is contained in:
Diego Biurrun 2011-07-17 13:27:27 +02:00
parent e463f0e979
commit 76e25dbca6
3 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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"); av_log(s, AV_LOG_ERROR, "Unable to open an input RTP port\n");
err = AVERROR(EIO); err = AVERROR(EIO);
goto fail; goto fail;
#endif
rtp_opened: rtp_opened:
port = rtp_get_local_rtp_port(rtsp_st->rtp_handle); port = rtp_get_local_rtp_port(rtsp_st->rtp_handle);

3
libavformat/rtsp.h
View File

@ -220,9 +220,6 @@ typedef struct RTSPState {
* see rtsp_read_play() and rtsp_read_seek(). */ * see rtsp_read_play() and rtsp_read_seek(). */
int64_t seek_timestamp; int64_t seek_timestamp;
/* XXX: currently we use unbuffered input */
// AVIOContext rtsp_gb;
int seq; /**< RTSP command sequence number */ int seq; /**< RTSP command sequence number */
/** copy of RTSPMessageHeader->session_id, i.e. the server-provided session /** copy of RTSPMessageHeader->session_id, i.e. the server-provided session

6
libavformat/rtspdec.c
View File

@ -383,12 +383,6 @@ static int rtsp_read_close(AVFormatContext *s)
{ {
RTSPState *rt = s->priv_data; 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_send_cmd_async(s, "TEARDOWN", rt->control_uri, NULL);
ff_rtsp_close_streams(s); ff_rtsp_close_streams(s);