[FFmpeg-cvslog] r20361 - in trunk: configure libavformat/Makefile libavformat/allformats.c libavformat/rtsp.c

[diego]

Author: diego
Date: Sat Oct 24 14:44:27 2009
New Revision: 20361

Log:
Remove ancient redir demuxer.
HTTP supports redirection just fine without it.

Modified:
   trunk/configure
   trunk/libavformat/Makefile
   trunk/libavformat/allformats.c
   trunk/libavformat/rtsp.c

Modified: trunk/configure
==============================================================================
--- trunk/configure	Sat Oct 24 14:39:38 2009	(r20360)
+++ trunk/configure	Sat Oct 24 14:44:27 2009	(r20361)
@@ -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"

Modified: trunk/libavformat/Makefile
==============================================================================
--- trunk/libavformat/Makefile	Sat Oct 24 14:39:38 2009	(r20360)
+++ trunk/libavformat/Makefile	Sat Oct 24 14:44:27 2009	(r20361)
@@ -188,7 +188,6 @@ OBJS-$(CONFIG_QCP_DEMUXER)              
 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

Modified: trunk/libavformat/allformats.c
==============================================================================
--- trunk/libavformat/allformats.c	Sat Oct 24 14:39:38 2009	(r20360)
+++ trunk/libavformat/allformats.c	Sat Oct 24 14:44:27 2009	(r20361)
@@ -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);

Modified: trunk/libavformat/rtsp.c
==============================================================================
--- trunk/libavformat/rtsp.c	Sat Oct 24 14:39:38 2009	(r20360)
+++ trunk/libavformat/rtsp.c	Sat Oct 24 14:44:27 2009	(r20361)
@@ -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