From 47bfe49c649b0ad8fc654de9acfc70971c43a911 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Wed, 27 Oct 2010 00:42:35 +0000 Subject: rtsp: Add stub declarations of the setup_in/output_streams functions This may be needed to avoid calls to implicitly defined functions (that will be removed by dead code elimination later anyway). Originally committed as revision 25585 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/rtsp.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'libavformat/rtsp.c') diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index bc9864a..cd0ea31 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -1261,7 +1261,13 @@ static int rtsp_setup_input_streams(AVFormatContext *s, RTSPMessageHeader *reply return 0; } -#endif /* CONFIG_RTSP_DEMUXER */ +#else /* !CONFIG_RTSP_DEMUXER */ +/* A declaration of this function is needed so that the function is + * defined when parsing the call to it, even if dead code elimination + * will remove the call later. + */ +static int rtsp_setup_input_streams(AVFormatContext *s, RTSPMessageHeader *reply); +#endif /* !CONFIG_RTSP_DEMUXER */ #if CONFIG_RTSP_MUXER static int rtsp_setup_output_streams(AVFormatContext *s, const char *addr) @@ -1327,7 +1333,13 @@ static int rtsp_setup_output_streams(AVFormatContext *s, const char *addr) return 0; } -#endif /* CONFIG_RTSP_MUXER */ +#else /* !CONFIG_RTSP_MUXER */ +/* A declaration of this function is needed so that the function is + * defined when parsing the call to it, even if dead code elimination + * will remove the call later. + */ +static int rtsp_setup_output_streams(AVFormatContext *s, const char *addr); +#endif /* !CONFIG_RTSP_MUXER */ void ff_rtsp_close_connections(AVFormatContext *s) { -- cgit v1.1