properly compile code for REDIR_DEMUXER

Originally committed as revision 8840 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
index c65ff47..17fe297 100644 (file)
--- a/libavformat/rtsp.c
+++ b/libavformat/rtsp.c
@@ -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

diff --git a/libavformat/utils.c b/libavformat/utils.c
index ad1e50e..a4a78ba 100644 (file)
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -452,7 +452,7 @@ int av_open_input_file(AVFormatContext **ic_ptr, const char *filename,
     }
 
     /* 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);