# HG changeset patch # User alex # Date 1177609110 0 # Node ID 5b54f43626d05223f97e12a0d2bc6ab87ef1d610 # Parent 2e0e98c0b622c1d50f1394ca3a2307509c1f397c remove unused rtsp_callback diff -r 2e0e98c0b622 -r 5b54f43626d0 rtsp.c --- a/rtsp.c Thu Apr 26 17:35:31 2007 +0000 +++ b/rtsp.c Thu Apr 26 17:38:30 2007 +0000 @@ -77,8 +77,6 @@ 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 @@ } -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 @@ } } - /* 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 @@ 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 -r 2e0e98c0b622 -r 5b54f43626d0 rtsp.h --- a/rtsp.h Thu Apr 26 17:35:31 2007 +0000 +++ b/rtsp.h Thu Apr 26 17:38:30 2007 +0000 @@ -76,16 +76,12 @@ 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);