[Mplayer-cvslog] CVS: main/libmpdemux aviheader.c,1.55,1.56

[Diego Biurrun]

On Thu, Apr 29, 2004 at 08:27:32AM +0200, Alex Beregszaszi wrote:
> Modified Files:
> 	aviheader.c 
> Log Message:
> forgot to commit

It still does not compile, though.

cc -c -I../libvo/ -I../../libvo -g -O4 -march=k6-3 -mcpu=k6-3 -pipe
-ffast-math -fomit-frame-pointer -D_REENTRANT -I/usr/include/gtk-1.2
-I/usr/include/glib-1.2 -I/usr/lib/glib/include -I. -Inative -I..
-I../libmpdemux -I../loader -I/usr/include/gtk-1.2
-I/usr/include/glib-1.2 -I/usr/lib/glib/include -D_GNU_SOURCE -o
ad_ra1428.o ad_ra1428.c
ad_ra1428.c: In function `init':
ad_ra1428.c:55: warning: use of cast expressions as lvalues is
deprecated
ad_ra1428.c:58: warning: use of cast expressions as lvalues is
deprecated
cc -c -I../libvo/ -I../../libvo -g -O4 -march=k6-3 -mcpu=k6-3 -pipe
-ffast-math -fomit-frame-pointer -D_REENTRANT -I/usr/include/gtk-1.2
-I/usr/include/glib-1.2 -I/usr/lib/glib/include -I. -Inative -I..
-I../libmpdemux -I../loader -I/usr/include/gtk-1.2
-I/usr/include/glib-1.2 -I/usr/lib/glib/include -D_GNU_SOURCE -o
ad_acm.o ad_acm.c
In file included from ../libmpdemux/stheader.h:4,
                 from ad_internal.h:7,
                 from ad_acm.c:13:
../libmpdemux/aviheader.h:31: error: redefinition of `FOURCC'
../loader/wine/msacm.h:24: error: `FOURCC' previously declared here
In file included from ../libmpdemux/stheader.h:5,
                 from ad_internal.h:7,
                 from ad_acm.c:13:
../libmpdemux/ms_hdr.h:17: error: redefinition of `struct
mpeglayer3waveformat_tag'
../libmpdemux/ms_hdr.h:24: error: redefinition of `MPEGLAYER3WAVEFORMAT'
../loader/wine/mmreg.h:99: error: `MPEGLAYER3WAVEFORMAT' previously
declared here

Diego