[MPlayer-dev-eng] [PATCH] printf -> mp_msg conversion (etc.), second patches

[Diego Biurrun]

The Wanderer writes:
> 
> +>>>>>>> 1.780

100l

Please compile your tree, this way this type of error will not slip
through unnoticed and/or look through the changes you made with "cvs
diff -u".  You've already sent in a compile breaking patch once that I
(carelessly) applied.  This indicates a problem with the way you
create patches.  It's critical that you build your stuff to test it.

Patch rejected.

Diego