[Mplayer-cvslog] CVS: main mplayer.c,1.445,1.446

[Arpi]

Hi,

> > Log Message:
> > include font_load.h directly, instead of via video_out.h
> No good.
> 
> gcc -c -O4 -march=i486 -mcpu=i686 -pipe -ffast-math -fomit-frame-pointer -D_
> REENTRANT -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -
> Ilibmpdemux -Iloader -Ilibvo   -o mplayer.o mplayer.c
> In file included from mplayer.c:39:
> libvo/font_load.h:6: conflicting types for .aw_file'
> libvo/font_load.h:6: previous declaration of .aw_file'
> libvo/font_load.h:21: conflicting types for .ont_desc_t'
> libvo/font_load.h:21: previous declaration of .ont_desc_t'
> libvo/font_load.h:23: conflicting types for .oad_raw'
> libvo/font_load.h:23: previous declaration of .oad_raw'
> libvo/font_load.h:24: conflicting types for .ead_font_desc'
> libvo/font_load.h:24: previous declaration of .ead_font_desc'

ah forgot to commit the others :)
try now

A'rpi / Astral & ESP-team

--
Developer of MPlayer, the Movie Player for Linux - http://www.MPlayerHQ.hu