From 0913873e5b681a8655396365799b2743924a8902 Mon Sep 17 00:00:00 2001 From: Alex Beregszaszi Date: Thu, 26 Apr 2007 17:38:30 +0000 Subject: [PATCH] remove unused rtsp_callback Originally committed as revision 8832 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/rtsp.c | 23 ----------------------- libavformat/rtsp.h | 4 ---- 2 files changed, 27 deletions(-) diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index 7d4c6bf..c65ff47 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -77,8 +77,6 @@ static int rtsp_read_play(AVFormatContext *s); int rtsp_default_protocols = (1 << RTSP_PROTOCOL_RTP_UDP); -FFRTSPCallback *ff_rtsp_callback = NULL; - static int rtsp_probe(AVProbeData *p) { if (strstart(p->filename, "rtsp:", NULL)) @@ -818,12 +816,6 @@ static void rtsp_send_cmd(AVFormatContext *s, } -void rtsp_set_callback(FFRTSPCallback *rtsp_cb) -{ - ff_rtsp_callback = rtsp_cb; -} - - /* close and free RTSP streams */ static void rtsp_close_streams(RTSPState *rt) { @@ -1039,16 +1031,6 @@ static int rtsp_read_header(AVFormatContext *s, } } - /* use callback if available to extend setup */ - if (ff_rtsp_callback) { - if (ff_rtsp_callback(RTSP_ACTION_CLIENT_SETUP, rt->session_id, - NULL, 0, rt->last_reply) < 0) { - err = AVERROR_INVALIDDATA; - goto fail; - } - } - - rt->state = RTSP_STATE_IDLE; rt->seek_timestamp = 0; /* default is to start stream at position zero */ @@ -1295,11 +1277,6 @@ static int rtsp_read_close(AVFormatContext *s) s->filename); rtsp_send_cmd(s, cmd, reply, NULL); - if (ff_rtsp_callback) { - ff_rtsp_callback(RTSP_ACTION_CLIENT_TEARDOWN, rt->session_id, - NULL, 0, NULL); - } - rtsp_close_streams(rt); url_close(rt->rtsp_hd); return 0; diff --git a/libavformat/rtsp.h b/libavformat/rtsp.h index 481e2ba..ddf2448 100644 --- a/libavformat/rtsp.h +++ b/libavformat/rtsp.h @@ -76,16 +76,12 @@ typedef int FFRTSPCallback(enum RTSPCallbackAction action, char *buf, int buf_size, void *arg); -/** useful for modules: set RTSP callback function */ -void rtsp_set_callback(FFRTSPCallback *rtsp_cb); - int rtsp_init(void); void rtsp_parse_line(RTSPHeader *reply, const char *buf); extern int rtsp_default_protocols; extern int rtsp_rtp_port_min; extern int rtsp_rtp_port_max; -extern FFRTSPCallback *ff_rtsp_callback; extern AVInputFormat rtsp_demuxer; int rtsp_pause(AVFormatContext *s); -- 2.7.4