[MPlayer-cvslog] r19341 - in trunk/stream: Makefile asf_mmst_streaming.c asf_streaming.c network.c network.h pnm.c stream_ftp.c stream_netstream.c stream_rtsp.c stream_vstream.c tcp.c tcp.h

Uoti Urpala uoti.urpala at pp1.inet.fi
Sat Aug 5 14:28:03 CEST 2006


On Sat, 2006-08-05 at 13:22 +0200, Reimar Döffinger wrote:
> > --- trunk/stream/network.c	(original)

> > --- (empty file)
> > +++ trunk/stream/tcp.c	Sat Aug  5 12:30:06 2006
> 
> using svn cp between these would probably have resulted in a much more
> readable diff.

At least if he hadn't also uglified the code with negative cosmetic
changes while copying it. It seems to have been changed to GNU coding
style (?) with a linefeed before every opening brace and function
arguments separated from the function they belong to.

> > + *   (originally borrowed from network.c,
> 
> And made this comment obsolete.
> Can this still be fixed?

If you mean changing it to a state where annotate works, I think it
would be possible to copy a past version of network.c and recommit
(delete current tcp.c, recreate it as a copy of past network.c, commit
changes to leave only tcp code).




More information about the MPlayer-cvslog mailing list