On Sat, Jul 04, 2009 at 08:59:56PM +0200, gkovacs wrote: > > Log: > moved format-independent demuxer portions from m3u demuxer into concatgen for > future reuse in pls, asx, and xpsf demuxers
Please write commit messages in an editor, not with 'svn ci -m' and break overly long lines. > Added: > concat/libavformat/concat.c > concat/libavformat/concatgen.c > concat/libavformat/concatgen.h You should have used 'svn copy' instead of 'svn add'. You were copying code around and now the history is lost. > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ concat/libavformat/concatgen.c Sat Jul 4 20:59:56 2009 (r4595) > @@ -0,0 +1,132 @@ > + > +int concatgen_read_packet(AVFormatContext *s, > + AVPacket *pkt) Indentation is off. > +int concatgen_read_seek(AVFormatContext *s, > + int stream_index, > + int64_t pts, > + int flags) ditto > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ concat/libavformat/concatgen.h Sat Jul 4 20:59:56 2009 (r4595) > @@ -0,0 +1,40 @@ > + > +#ifndef _CONCATGEN_H > +#define _CONCATGEN_H This is an illegal identifier, it starts with an underscore and a capital letter. Such identifiers are reserved for the system, you should not use them. Furthermore, this is not a standard multiple inclusion guard as we use them. It should have an AVFORMAT_ prefix. > +int concatgen_read_packet(AVFormatContext *s, AVPacket *pkt); > + > +int concatgen_read_seek(AVFormatContext *s, int stream_index, int64_t pts, > int flags); > + > +int concatgen_read_timestamp(AVFormatContext *s, int stream_index, int64_t > *pos, int64_t pos_limit); > + > +int concatgen_read_close(AVFormatContext *s); > + > +int concatgen_read_play(AVFormatContext *s); > + > +int concatgen_read_pause(AVFormatContext *s); I think all these functions need ff_ prefixes. > --- concat/libavformat/m3u.c Sat Jul 4 17:04:59 2009 (r4594) > +++ concat/libavformat/m3u.c Sat Jul 4 20:59:56 2009 (r4595) > @@ -101,132 +96,22 @@ static int m3u_read_header(AVFormatConte > --- concat/libavformat/playlist.h Sat Jul 4 17:04:59 2009 (r4594) > +++ concat/libavformat/playlist.h Sat Jul 4 20:59:56 2009 (r4595) > @@ -19,6 +19,11 @@ > > +#ifndef _PLAYLIST_H > +#define _PLAYLIST_H see above Diego _______________________________________________ FFmpeg-soc mailing list [email protected] https://lists.mplayerhq.hu/mailman/listinfo/ffmpeg-soc
