[FFmpeg-cvslog] r25585 - trunk/libavformat/rtsp.c

mstorsjo subversion
Wed Oct 27 02:42:35 CEST 2010


Author: mstorsjo
Date: Wed Oct 27 02:42:35 2010
New Revision: 25585

Log:
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).

Modified:
   trunk/libavformat/rtsp.c

Modified: trunk/libavformat/rtsp.c
==============================================================================
--- trunk/libavformat/rtsp.c	Wed Oct 27 01:01:17 2010	(r25584)
+++ trunk/libavformat/rtsp.c	Wed Oct 27 02:42:35 2010	(r25585)
@@ -1261,7 +1261,13 @@ static int rtsp_setup_input_streams(AVFo
 
     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(AVF
 
     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)
 {



More information about the ffmpeg-cvslog mailing list