[Ffmpeg-cvslog] r8840 - in trunk/libavformat: rtsp.c utils.c

alex subversion
Fri Apr 27 01:40:36 CEST 2007


Author: alex
Date: Fri Apr 27 01:40:36 2007
New Revision: 8840

Log:
properly compile code for REDIR_DEMUXER

Modified:
   trunk/libavformat/rtsp.c
   trunk/libavformat/utils.c

Modified: trunk/libavformat/rtsp.c
==============================================================================
--- trunk/libavformat/rtsp.c	(original)
+++ trunk/libavformat/rtsp.c	Fri Apr 27 01:40:36 2007
@@ -1399,6 +1399,7 @@ AVInputFormat sdp_demuxer = {
 };
 #endif
 
+#ifdef CONFIG_REDIR_DEMUXER
 /* dummy redirector format (used directly in av_open_input_file now) */
 static int redir_probe(AVProbeData *pd)
 {
@@ -1461,3 +1462,4 @@ AVInputFormat redir_demuxer = {
     NULL,
     NULL,
 };
+#endif

Modified: trunk/libavformat/utils.c
==============================================================================
--- trunk/libavformat/utils.c	(original)
+++ trunk/libavformat/utils.c	Fri Apr 27 01:40:36 2007
@@ -452,7 +452,7 @@ int av_open_input_file(AVFormatContext *
     }
 
     /* XXX: suppress this hack for redirectors */
-#ifdef CONFIG_NETWORK
+#ifdef CONFIG_REDIR_DEMUXER
     if (fmt == &redir_demuxer) {
         err = redir_open(ic_ptr, pb);
         url_fclose(pb);




More information about the ffmpeg-cvslog mailing list