[Ffmpeg-devel] [RFC PATCH] Selectable protocols

[Diego Biurrun]

On Fri, Apr 27, 2007 at 01:13:13AM +0200, Alex Beregszaszi wrote:
> 
> Second edition. There is huge interdepdency in the RTP/RTSP related
> code, and I guess this was the best way to solve the puzzle for now. Of
> course it should be cleaned up further.
> 
> --- configure	(revision 8839)
> +++ configure	(working copy)
> @@ -1777,11 +1786,12 @@
>  enabled_any $DECODER_LIST && enable decoders
>  enabled_any $MUXER_LIST   && enable muxers
>  enabled_any $DEMUXER_LIST && enable demuxers
> +enabled_any $PROTOCOL_LIST && enable protocols

Please align this after you commit the patch.

> --- libavformat/utils.c	(revision 8839)
> +++ libavformat/utils.c	(working copy)
> @@ -452,7 +452,7 @@
>  
>      /* XXX: suppress this hack for redirectors */
> -#ifdef CONFIG_NETWORK
> +#ifdef CONFIG_REDIR_DEMUXER
>      if (fmt == &redir_demuxer) {
>          err = redir_open(ic_ptr, pb);

Should be committed separately.

> --- libavformat/allformats.c	(revision 8839)
> +++ libavformat/allformats.c	(working copy)
> @@ -162,15 +164,10 @@
>  
> +    REGISTER_PROTOCOL(FILE, file);
> +    REGISTER_PROTOCOL(HTTP, http);
> +    REGISTER_PROTOCOL(PIPE, pipe);
> +    REGISTER_PROTOCOL(RTP, rtp);
> +    REGISTER_PROTOCOL(TCP, tcp);
> +    REGISTER_PROTOCOL(UDP, udp);

Align the second column please.

> --- libavformat/rtsp.c	(revision 8839)
> +++ libavformat/rtsp.c	(working copy)
> @@ -1282,6 +1282,7 @@
>  
> +#ifdef CONFIG_RTSP_DEMUXER
>  AVInputFormat rtsp_demuxer = {
>      "rtsp",
> @@ -1295,6 +1296,7 @@
>      .read_pause = rtsp_read_pause,
>  };
> +#endif
>  
> @@ -1399,6 +1401,7 @@
>  
> +#ifdef CONFIG_REDIR_DEMUXER
>  /* dummy redirector format (used directly in av_open_input_file now) */
>  static int redir_probe(AVProbeData *pd)
> @@ -1461,3 +1464,4 @@
>      NULL,
>  };
> +#endif

This should be committed separately.

Diego