[MPlayer-users] cvs compile error

[Torinthiel]

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

-- 
 Waclaw "Torinthiel" Schiller       GG#: 542916, 3073512
   torinthiel(at)wp(dot)pl
   gpg: B06901F1 fpr: FAA3 559F CAE9 34DE CDC8  7346 2B6E 39F2 B069 01F1
 "No classmates may be used during this examination"
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
URL: <http://lists.mplayerhq.hu/pipermail/mplayer-users/attachments/20031229/604303f3/attachment.pgp>