[Ffmpeg-devel] [PATCH] BMP encoder (again!)

[Diego Biurrun]

On Mon, Feb 05, 2007 at 04:18:55PM +0100, Michel Bardiaux wrote:
> Diego Biurrun wrote:
> >
> >Committed with changelog entry.
> 
> Thanks.
> 
> But now I've a slight problem:
> 
> svn update
> G  libavcodec/avcodec.h
> svn: Failed to add file 'libavcodec/bmpenc.c': object of the same name 
> already exists
> 
> svn status
> !      libavcodec
> A      libavcodec/bmpenc.c
> 
> What is the official remedy for such a situation?

(Re)move your bmpenc.c.  What else?

Diego