On Sun, Jul 05, 2009 at 08:05:04AM +0200, gkovacs wrote:
>
> Log:
> added ffmpeg conc option to concatenate input files
>
> --- concat/libavformat/concat.c Sun Jul 5 08:04:45 2009 (r4609)
> +++ concat/libavformat/concat.c Sun Jul 5 08:05:04 2009 (r4610)
> @@ -33,14 +33,37 @@ static int concat_probe(AVProbeData *p)
>
> +AVInputFormat *concat_make_demuxer()
void
> + cdm->name = "concat";
> + cdm->long_name = NULL_IF_CONFIG_SMALL("CONCAT format");
> + cdm->priv_data_size = sizeof(PlaylistContext);
> + cdm->read_probe = concat_probe;
> + cdm->read_header = concat_read_header;
> + cdm->read_packet = concatgen_read_packet;
> + cdm->read_close = concatgen_read_close;
> + cdm->read_seek = concatgen_read_seek;
> + cdm->read_timestamp = concatgen_read_timestamp;
> + cdm->flags = NULL;
> + cdm->extensions = NULL;
> + cdm->value = NULL;
> + cdm->read_play = concatgen_read_play;
> + cdm->read_pause = concatgen_read_pause;
> + cdm->codec_tag = codec_concat_tags;
> + cdm->read_seek2 = concatgen_read_seek;
> + cdm->metadata_conv = NULL;
> + cdm->next = NULL;
All of this should be vertically aligned.
> --- concat/libavformat/concat.h Sun Jul 5 08:04:45 2009 (r4609)
> +++ concat/libavformat/concat.h Sun Jul 5 08:05:04 2009 (r4610)
> @@ -1,2 +1,34 @@
> +
> +#include "concatgen.h"
> +
> +#ifndef _CONCAT_H
> +#define _CONCAT_H
nonstandard and illegal identifier
Diego
_______________________________________________
FFmpeg-soc mailing list
[email protected]
https://lists.mplayerhq.hu/mailman/listinfo/ffmpeg-soc
