diff options
| -rwxr-xr-x | configure | 1 | ||||
| -rw-r--r-- | libavformat/Makefile | 1 | ||||
| -rw-r--r-- | libavformat/allformats.c | 1 | ||||
| -rw-r--r-- | libavformat/rtsp.c | 66 |
4 files changed, 0 insertions, 69 deletions
@@ -1201,7 +1201,6 @@ mp4_muxer_select="mov_muxer" mpegtsraw_demuxer_select="mpegts_demuxer" mxf_d10_muxer_select="mxf_muxer" psp_muxer_select="mov_muxer" -redir_demuxer_deps="network" rtp_muxer_deps="network rtp_protocol" rtsp_demuxer_deps="sdp_demuxer" sdp_demuxer_deps="rtp_protocol mpegts_demuxer" diff --git a/libavformat/Makefile b/libavformat/Makefile index 284d7d693e..e22608a6db 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -188,7 +188,6 @@ OBJS-$(CONFIG_QCP_DEMUXER) += qcp.o OBJS-$(CONFIG_R3D_DEMUXER) += r3d.o OBJS-$(CONFIG_RAWVIDEO_DEMUXER) += raw.o OBJS-$(CONFIG_RAWVIDEO_MUXER) += raw.o -OBJS-$(CONFIG_REDIR_DEMUXER) += rtsp.o OBJS-$(CONFIG_RL2_DEMUXER) += rl2.o OBJS-$(CONFIG_RM_DEMUXER) += rmdec.o rm.o OBJS-$(CONFIG_RM_MUXER) += rmenc.o rm.o diff --git a/libavformat/allformats.c b/libavformat/allformats.c index c35b060b5a..f978426fdd 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -162,7 +162,6 @@ void av_register_all(void) REGISTER_DEMUXER (QCP, qcp); REGISTER_DEMUXER (R3D, r3d); REGISTER_MUXDEMUX (RAWVIDEO, rawvideo); - REGISTER_DEMUXER (REDIR, redir); REGISTER_DEMUXER (RL2, rl2); REGISTER_MUXDEMUX (RM, rm); REGISTER_MUXDEMUX (ROQ, roq); diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index ddf51ed746..e45966cac3 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -1777,69 +1777,3 @@ AVInputFormat sdp_demuxer = { sdp_read_close, }; #endif - -#if CONFIG_REDIR_DEMUXER -/* dummy redirector format (used directly in av_open_input_file now) */ -static int redir_probe(AVProbeData *pd) -{ - const char *p; - p = pd->buf; - skip_spaces(&p); - if (av_strstart(p, "http://", NULL) || - av_strstart(p, "rtsp://", NULL)) - return AVPROBE_SCORE_MAX; - return 0; -} - -static int redir_read_header(AVFormatContext *s, AVFormatParameters *ap) -{ - char buf[4096], *q; - int c; - AVFormatContext *ic = NULL; - ByteIOContext *f = s->pb; - - /* parse each URL and try to open it */ - c = url_fgetc(f); - while (c != URL_EOF) { - /* skip spaces */ - for(;;) { - if (!redir_isspace(c)) - break; - c = url_fgetc(f); - } - if (c == URL_EOF) - break; - /* record url */ - q = buf; - for(;;) { - if (c == URL_EOF || redir_isspace(c)) - break; - if ((q - buf) < sizeof(buf) - 1) - *q++ = c; - c = url_fgetc(f); - } - *q = '\0'; - //printf("URL='%s'\n", buf); - /* try to open the media file */ - if (av_open_input_file(&ic, buf, NULL, 0, NULL) == 0) - break; - } - if (!ic) - return AVERROR(EIO); - - *s = *ic; - url_fclose(f); - - return 0; -} - -AVInputFormat redir_demuxer = { - "redir", - NULL_IF_CONFIG_SMALL("Redirector format"), - 0, - redir_probe, - redir_read_header, - NULL, - NULL, -}; -#endif |