[FFmpeg-soc] [soc]: r4620 - in concat/libavformat: Makefile.diff allformats.c.diff concat.c datanode.c datanode.h pls.c

[Diego Biurrun]

On Sun, Jul 05, 2009 at 09:52:51PM +0200, gkovacs wrote:
> 
> Log:
> added pls demuxer

This commit contains unrelated changes, not for the first time..

> --- concat/libavformat/Makefile.diff	Sun Jul  5 21:48:52 2009	(r4619)
> +++ concat/libavformat/Makefile.diff	Sun Jul  5 21:52:51 2009	(r4620)
> @@ -1,12 +1,12 @@
>  diff --git a/libavformat/Makefile b/libavformat/Makefile
> -index 8e8a869..23074a7 100644
> +index 8e8a869..1dee9be 100644
>  --- a/libavformat/Makefile
>  +++ b/libavformat/Makefile
>  @@ -175,6 +175,7 @@ OBJS-$(CONFIG_PCM_U32LE_DEMUXER)         += raw.o
>   OBJS-$(CONFIG_PCM_U8_DEMUXER)            += raw.o
>   OBJS-$(CONFIG_PCM_U8_MUXER)              += raw.o
> -+OBJS-$(CONFIG_CONCAT_DEMUXER)            += m3u.o playlist.o concat.o concatgen.o datanode.o
> ++OBJS-$(CONFIG_CONCAT_DEMUXER)            += m3u.o pls.o playlist.o concat.o concatgen.o datanode.o
>   OBJS-$(CONFIG_PSP_MUXER)                 += movenc.o riff.o isom.o avc.o

You are breaking alphabetical order.

> --- concat/libavformat/allformats.c.diff	Sun Jul  5 21:48:52 2009	(r4619)
> +++ concat/libavformat/allformats.c.diff	Sun Jul  5 21:52:51 2009	(r4620)
> @@ -1,12 +1,14 @@
>  diff --git a/libavformat/allformats.c b/libavformat/allformats.c
> -index ad47631..08a460b 100644
> +index ad47631..433be82 100644
>  --- a/libavformat/allformats.c
>  +++ b/libavformat/allformats.c
> -@@ -66,6 +66,7 @@ void av_register_all(void)
> +@@ -66,6 +66,9 @@ void av_register_all(void)
>       REGISTER_DEMUXER  (C93, c93);
>       REGISTER_DEMUXER  (CAVSVIDEO, cavsvideo);
> ++    REGISTER_DEMUXER  (CONCAT, concat);
>  +    REGISTER_DEMUXER  (M3U, m3u);
> ++    REGISTER_DEMUXER  (PLS, pls);
>       REGISTER_MUXER    (CRC, crc);

ditto

> --- concat/libavformat/concat.c	Sun Jul  5 21:48:52 2009	(r4619)
> +++ concat/libavformat/concat.c	Sun Jul  5 21:52:51 2009	(r4620)
> @@ -63,7 +63,7 @@ AVInputFormat *concat_make_demuxer()
>  
> -#if 0
> +#if CONFIG_CONCAT_DEMUXER
>  AVInputFormat concat_demuxer = {

This is an unrelated change.

The #if should be unnecessary.  Only compile this file if the concat
demuxer has been selected.

> --- concat/libavformat/datanode.c	Sun Jul  5 21:48:52 2009	(r4619)
> +++ concat/libavformat/datanode.c	Sun Jul  5 21:52:51 2009	(r4620)

All the changes to this file look unrelated.

> --- concat/libavformat/pls.c	Sun Jul  5 21:48:52 2009	(r4619)
> +++ concat/libavformat/pls.c	Sun Jul  5 21:52:51 2009	(r4620)
> @@ -1,2 +1,99 @@
>  
> +/* The ffmpeg codecs we support, and the IDs they have in the file */

FFmpeg

> +#if CONFIG_PLS_DEMUXER
> +AVInputFormat pls_demuxer = {
> +    "pls",

see above

Diego