Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Beregszaszi <alex@rtfs.hu>2007-04-27 03:40:36 +0400
committerAlex Beregszaszi <alex@rtfs.hu>2007-04-27 03:40:36 +0400
commite7047005cbe5cbfba6ddc764437457b6a6d72c21 (patch)
tree8fdfea0e4b211583dbaa9e0e28e2c9a7dc2d7ac3
parent6a4970abd15ddf45e0f8c0bed0ca00950707d83e (diff)
properly compile code for REDIR_DEMUXER
Originally committed as revision 8840 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavformat/rtsp.c2
-rw-r--r--libavformat/utils.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
index c65ff47995..17fe297a9c 100644
--- 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 ad1e50e3e9..a4a78ba975 100644
--- 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);