generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove unused rtsp_callback

Browse Source 
Originally committed as revision 8832 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Alex Beregszaszi 2007-04-26 17:38:30 +00:00
parent f87462ccef
commit 0913873e5b
2 changed files with 0 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libavformat/rtsp.c
View File

@ -77,8 +77,6 @@ static int rtsp_read_play(AVFormatContext *s);
int rtsp_default_protocols = (1 << RTSP_PROTOCOL_RTP_UDP); int rtsp_default_protocols = (1 << RTSP_PROTOCOL_RTP_UDP);
FFRTSPCallback *ff_rtsp_callback = NULL;
static int rtsp_probe(AVProbeData *p) static int rtsp_probe(AVProbeData *p)
{ {
if (strstart(p->filename, "rtsp:", NULL)) 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 */ /* close and free RTSP streams */
static void rtsp_close_streams(RTSPState *rt) 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->state = RTSP_STATE_IDLE;
rt->seek_timestamp = 0; /* default is to start stream at position rt->seek_timestamp = 0; /* default is to start stream at position
zero */ zero */
@ -1295,11 +1277,6 @@ static int rtsp_read_close(AVFormatContext *s)
s->filename); s->filename);
rtsp_send_cmd(s, cmd, reply, NULL); 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); rtsp_close_streams(rt);
url_close(rt->rtsp_hd); url_close(rt->rtsp_hd);
return 0; return 0;

4
libavformat/rtsp.h
View File

@ -76,16 +76,12 @@ typedef int FFRTSPCallback(enum RTSPCallbackAction action,
char *buf, int buf_size, char *buf, int buf_size,
void *arg); void *arg);
/** useful for modules: set RTSP callback function */
void rtsp_set_callback(FFRTSPCallback *rtsp_cb);
int rtsp_init(void); int rtsp_init(void);
void rtsp_parse_line(RTSPHeader *reply, const char *buf); void rtsp_parse_line(RTSPHeader *reply, const char *buf);
extern int rtsp_default_protocols; extern int rtsp_default_protocols;
extern int rtsp_rtp_port_min; extern int rtsp_rtp_port_min;
extern int rtsp_rtp_port_max; extern int rtsp_rtp_port_max;
extern FFRTSPCallback *ff_rtsp_callback;
extern AVInputFormat rtsp_demuxer; extern AVInputFormat rtsp_demuxer;
int rtsp_pause(AVFormatContext *s); int rtsp_pause(AVFormatContext *s);