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

mstorsjo subversion
Thu Oct 21 14:25:13 CEST 2010


Author: mstorsjo
Date: Thu Oct 21 14:25:12 2010
New Revision: 25537

Log:
rtsp: Move the rtsp_probe function to the demuxer code block

This function is only used by the RTSP demuxer.

Modified:
   trunk/libavformat/rtsp.c

Modified: trunk/libavformat/rtsp.c
==============================================================================
--- trunk/libavformat/rtsp.c	Thu Oct 21 14:19:14 2010	(r25536)
+++ trunk/libavformat/rtsp.c	Thu Oct 21 14:25:12 2010	(r25537)
@@ -546,13 +546,6 @@ static int rtsp_open_transport_ctx(AVFor
 }
 
 #if CONFIG_RTSP_DEMUXER || CONFIG_RTSP_MUXER
-static int rtsp_probe(AVProbeData *p)
-{
-    if (av_strstart(p->filename, "rtsp:", NULL))
-        return AVPROBE_SCORE_MAX;
-    return 0;
-}
-
 static void rtsp_parse_range(int *min_ptr, int *max_ptr, const char **pp)
 {
     const char *p;
@@ -1788,6 +1781,13 @@ end:
 #endif /* CONFIG_RTPDEC */
 
 #if CONFIG_RTSP_DEMUXER
+static int rtsp_probe(AVProbeData *p)
+{
+    if (av_strstart(p->filename, "rtsp:", NULL))
+        return AVPROBE_SCORE_MAX;
+    return 0;
+}
+
 static int rtsp_read_header(AVFormatContext *s,
                             AVFormatParameters *ap)
 {



More information about the ffmpeg-cvslog mailing list