[FFmpeg-soc] [soc]: r4646 - in concat: ffmpeg.c.diff libavformat/concat.c libavformat/concat.h libavformat/playlist.h

[Diego Biurrun]

On Tue, Jul 07, 2009 at 03:03:21AM +0200, gkovacs wrote:
> 
> Log:
> fixed inclusion guards, made concat_init_demuxer return void
> 
> --- concat/libavformat/concat.c	Mon Jul  6 23:54:01 2009	(r4645)
> +++ concat/libavformat/concat.c	Tue Jul  7 03:03:21 2009	(r4646)
> @@ -39,9 +39,8 @@ static int concat_read_header(AVFormatCo
>  
> -AVInputFormat *concat_make_demuxer()
> +void concat_init_demuxer(AVInputFormat *cdm)

Notice that in my review I was referring to the fact that empty
parameter lists should be denoted by the 'void' keyword, not just by
empty parentheses.

> --- concat/libavformat/concat.h	Mon Jul  6 23:54:01 2009	(r4645)
> +++ concat/libavformat/concat.h	Tue Jul  7 03:03:21 2009	(r4646)
> @@ -21,14 +21,14 @@
>  
> -AVInputFormat *concat_make_demuxer();
> +void concat_init_demuxer();

Now that .c and the .h file disagree.  Does this even compile?  You
should maybe #include the .h file in the .c file to avoid this kind of
mistake.

Diego