[FFmpeg-devel] [PATCH] fix sdp(file) vs rtsp dep

[Diego Biurrun]

On Tue, Nov 03, 2009 at 12:00:49AM +0100, Luca Abeni wrote:
> 
> Here is the patch I am currently working on. I just compile-tested it
> with some different configurations, and I tested the SDP demuxer.
> 
> If you can provide me with some "critical" configurations, tomorrow I'll
> compile-test them. I'll also run some tests for the RTSP demuxer. Can
> anyone provide me with some ms and real URLs for testing? (otherwise,
> I'll just test standard RTSP).

Try with the sdp demuxer and the rtsp demuxer separately disabled.

I still wonder why all the SDP code resides in rtsp.c.  I would expect
it in sdp.c.

> --- libavformat/rtsp.c	(revision 20433)
> +++ libavformat/rtsp.c	(working copy)
> @@ -43,19 +43,18 @@
>  
> +#if CONFIG_RTSP_DEMUXER
>  static int rtsp_read_play(AVFormatContext *s);
> +static int tcp_read_packet(AVFormatContext *s, RTSPStream **prtsp_st,
> +                           uint8_t *buf, int buf_size);
> +static int rtsp_read_reply (AVFormatContext *s, RTSPMessageHeader *reply,
> +                 unsigned char **content_ptr, int return_on_interleaved_data);
> +#endif

Is the #if really necessary?

Also, you could format newly added lines properly while you're at it.

Anyway, the patch is quite big.  Maybe you could split it by first
moving the functions around.

Diego