[MPlayer-users] cvs compile error

[Van Leer]

You were completely allright. I had applied a patch since I had 
experienced some problems with multifile. Thank you for your help.
van leer

Torinthiel ha scritto:
> [Automatic answer: RTFM (read DOCS, FAQ), also read DOCS/bugreports.html]
> 
> 
> ------------------------------------------------------------------------
> 
> On Mon, Dec 29, 2003 at 03:11:43PM +0100, Van Leer wrote:
> 
>>I've just updated to the latest cvs and I tried to install by means of 
>>the usual procedure but the make fails with the following error:
> 
> [cut]
> 
>>Does anybody know why this happens?
> 
> 
> There is no '<<' in vd_mpng.c
> My guess what it is:
> You've probably modified this file a long ago. Since then it has
> changed, in the area you've changed. Than during cvs up cvs displayed
> (and still will if you update second time):
> C libmpcodecs/vd_mpng.c
> which indicates you have a conflict in the file.
> Try editing it (CVS marks confilicts with >>>>>>> and <<<<<< - pretty
> easy to understand) and re-doing your change, or remove it at all.
> Torinthiel
> 
> 
> 
> ------------------------------------------------------------------------
> 
> _______________________________________________
> RTFM!!!  http://www.MPlayerHQ.hu/DOCS
> Search:  http://www.MPlayerHQ.hu/cgi-bin/htsearch
> http://mplayerhq.hu/mailman/listinfo/mplayer-users