[FFmpeg-cvslog] r25493 - in trunk: doc/APIchanges libavformat/asfdec.c libavformat/asfenc.c libavformat/avformat.h libavformat/avidec.c libavformat/avienc.c libavformat/flacdec.c libavformat/flacenc.c libavformat/...

Martin Storsjö martin
Sat Oct 16 10:51:15 CEST 2010


On Sat, 16 Oct 2010, Anton Khirnov wrote:

> On Fri, Oct 15, 2010 at 06:41:54PM -0700, Dave Yeo wrote:
> > On 10/15/10 12:04 pm, aurel wrote:
> > >--- trunk/libavformat/oggparsevorbis.c	Fri Oct 15 20:30:43 2010	(r25492)
> > >+++ trunk/libavformat/oggparsevorbis.c	Fri Oct 15 21:04:25 2010	(r25493)
> > >@@ -29,6 +29,7 @@
> > >  #include "libavcodec/bytestream.h"
> > >  #include "avformat.h"
> > >  #include "oggdec.h"
> > >+#include "vorbiscomment.c"
> > 
> > Is including vorbiscomment.c correct? Here (OS/2) and I guess on ppc
> > darwin gcc4.2.1 the build now dies with multiple symbol error. The
> > darwin error is more informative,
> > ld: duplicate symbol _ff_vorbiscomment_length in
> > libavformat/vorbiscomment.o and libavformat/oggparsevorbis.o
> > collect2: ld returned 1 exit status
> oops, that'll be 100l for me.
> 
> of course that's supposed to be "vorbiscomment.h".
> somebody with commit access please fix.

Fixed

// Martin



More information about the ffmpeg-cvslog mailing list