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

[Michel Bardiaux]

Diego Biurrun wrote:
> On Mon, Feb 05, 2007 at 03:31:58PM +0100, Michel Bardiaux wrote:
>> Diego Biurrun wrote:
>>> On Mon, Feb 05, 2007 at 11:15:57AM +0100, Michel Bardiaux wrote:
>>>> Michael Niedermayer wrote:
>>>>> On Wed, Jan 31, 2007 at 05:36:57PM +0100, Michel Bardiaux wrote:
>>>>>> This patch takes into account all the suggestions made, and all the 
>>>>>> recent changes in the build process.
>>>>> looks ok
>>>> Could someone commit this please? TIA.
>>> When adding a new decoder/encoder you need to bump the version number of
>>> libavcodec.  This is missing from the patch.
>> Corrected patch attached.
> 
> Forgot to say, there should also be a changelog entry.  

I will remember that.

> Committed with
> changelog entry.

Thanks.

But now I've a slight problem:

svn update
U  configure
U  Changelog
U  libavcodec/truemotion1.c
G  libavcodec/allcodecs.c
G  libavcodec/Makefile
G  libavcodec/avcodec.h
svn: Failed to add file 'libavcodec/bmpenc.c': object of the same name 
already exists

svn status
X      libswscale
?      tmp
!      .
M      ffmpeg.c
!      libavcodec
A      libavcodec/bmpenc.c

What is the official remedy for such a situation?

> 
> Diego



-- 
Michel Bardiaux
R&D Director
T +32 [0] 2 790 29 41
F +32 [0] 2 790 29 02
E mailto:mbardiaux at mediaxim.be

Mediaxim NV/SA
Vorstlaan 191 Boulevard du Souverain
Brussel 1160 Bruxelles
http://www.mediaxim.com/