[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/...

[Dave Yeo]

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

doing
-#include "vorbiscomment.c"
+#include "vorbiscomment.h"
allows the build to finish and fate to pass. Not really sure how to test 
the metadata.
Dave