summaryrefslogtreecommitdiff
path: root/libavformat/rtsp.c
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2010-02-22 21:28:19 +0000
committerMartin Storsjö <martin@martin.st>2010-02-22 21:28:19 +0000
commit6f5a3d0a7bb2a1e9deb09f8204e2b0eb7a922e02 (patch)
tree432001b95c368bbac77860dae81d4359d8912b48 /libavformat/rtsp.c
parentf86f66562311f38b6b7864c19720727916fb0d19 (diff)
Add an RTSP muxer
Originally committed as revision 21971 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/rtsp.c')
-rw-r--r--libavformat/rtsp.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
index 26b9e9312b..23d56b6c0a 100644
--- a/libavformat/rtsp.c
+++ b/libavformat/rtsp.c
@@ -691,7 +691,7 @@ static int rtsp_open_transport_ctx(AVFormatContext *s, RTSPStream *rtsp_st)
return 0;
}
-#if CONFIG_RTSP_DEMUXER
+#if CONFIG_RTSP_DEMUXER || CONFIG_RTSP_MUXER
static int rtsp_probe(AVProbeData *p)
{
if (av_strstart(p->filename, "rtsp:", NULL))
@@ -1533,7 +1533,9 @@ redirect:
}
return err;
}
+#endif
+#if CONFIG_RTSP_DEMUXER
static int rtsp_read_header(AVFormatContext *s,
AVFormatParameters *ap)
{