[FFmpeg-cvslog] r21666 - in trunk: Changelog libavformat/Makefile libavformat/allformats.c libavformat/avformat.h libavformat/concat.c

[Diego Biurrun]

On Sun, Feb 07, 2010 at 11:25:59AM +0100, stefano wrote:
> 
> Log:
> Implement a physical concatenation protocol.
> 
> Patch by Michele Orr? reverse(<moc.liamg at yp.rekam>).
> 
> --- trunk/libavformat/Makefile	Sun Feb  7 03:00:00 2010	(r21665)
> +++ trunk/libavformat/Makefile	Sun Feb  7 11:25:58 2010	(r21666)
> @@ -269,6 +269,7 @@ OBJS-$(CONFIG_RTMP_PROTOCOL)            
>  OBJS-$(CONFIG_RTP_PROTOCOL)              += rtpproto.o
>  OBJS-$(CONFIG_TCP_PROTOCOL)              += tcp.o
>  OBJS-$(CONFIG_UDP_PROTOCOL)              += udp.o
> +OBJS-$(CONFIG_CONCAT_PROTOCOL)           += concat.o
>  
> --- trunk/libavformat/allformats.c	Sun Feb  7 03:00:00 2010	(r21665)
> +++ trunk/libavformat/allformats.c	Sun Feb  7 11:25:58 2010	(r21666)
> @@ -221,4 +221,5 @@ void av_register_all(void)
>      REGISTER_PROTOCOL (TCP, tcp);
>      REGISTER_PROTOCOL (UDP, udp);
> +    REGISTER_PROTOCOL (CONCAT, concat);

Both of these break alphabetical order.

Diego