[FFmpeg-devel] Google Summer of Code participation

Michael Niedermayer michaelni
Tue Apr 7 03:07:24 CEST 2009


On Tue, Apr 07, 2009 at 01:45:01AM +0200, Thilo Borgmann wrote:
> Michael Niedermayer schrieb:
>>>  diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c
>>> index e69de29..8d9332b 100644
>>> --- a/libavcodec/avpacket.c
>>> +++ b/libavcodec/avpacket.c
>>> @@ -0,0 +1,83 @@
>>> +/*
>>> + * AVPacket functions for libavcodec
>>> + * Copyright (c) 2001 Fabrice Bellard
>>> + * Copyright (c) 2002-2004 Michael Niedermayer <michaelni at gmx.at>
>>> + *
>>> + * This file is part of FFmpeg.
>>> + *
>>> + * FFmpeg is free software; you can redistribute it and/or
>>> + * modify it under the terms of the GNU Lesser General Public
>>> + * License as published by the Free Software Foundation; either
>>> + * version 2.1 of the License, or (at your option) any later version.
>>> + *
>>> + * FFmpeg is distributed in the hope that it will be useful,
>>> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
>>> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
>>> + * Lesser General Public License for more details.
>>> + *
>>> + * You should have received a copy of the GNU Lesser General Public
>>> + * License along with FFmpeg; if not, write to the Free Software
>>> + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 
>>> 02110-1301 USA
>>> + */
>>> +
>>> +#include "libavcodec/avcodec.h"
>>>     
>>
>> libavcodec is redundant
>>
>> [...]
>>   
> "libavcodec/" deleted.
>
>
> Michael Niedermayer schrieb:
>>
>>
>> So to summarize you copied the copyright from a different file than the
>> code
>>
>> [...]
>>   
> If we see it from that perspective... and I've to say that seems to be the 
> correct perspective... altered to fit with libavformat/utils.c
>
>
> Stefano Sabatini schrieb:
>> On Monday 2009-04-06 17:46:37 +0200, Thilo Borgmann wrote:
>>   
>>> diff --git a/libavcodec/Makefile b/libavcodec/Makefile
>>> index e35e819..031821c 100644
>>> --- a/libavcodec/Makefile
>>> +++ b/libavcodec/Makefile
>>> @@ -22,6 +22,7 @@ OBJS = allcodecs.o                                      
>>>                 \
>>>         resample2.o                                                      
>>> \
>>>         simple_idct.o                                                    
>>> \
>>>         utils.o                                                          
>>> \
>>> +       avpacket.o                                                       
>>> \
>>>     
>>
>> Non in alphabetical order.
>>
>>   
> Now it is.
>>
>> I think here Michael means something like this, I don't use git so I
>> don't know which are the corresponding commands, so I'll use the svn
>> commands.
>>
>> svn cp libavformat/utils.c libavcodec/avpacket.c
>>
>> Then you edit libavcodec/avpacket.c so that it will contain *only* the
>> relevant functions. When copying the file the history for the file will
>> be inherited by the new file.
>>
>> Finally you can do:
>> svn diff libavformat/utils.c libavformat/avformat.h libavcodec/avcodec.h 
>> libavcodec/avpacket.c
>>
>> to get the complete patch.
>>
>>   
>
> Yes, thanks, yet another possibility. I will keep it in mind if Michael 
> wants to have it done that way after the little mistakes are cleared from 
> the patch. We'll see...
>
> Ok, the described corrections are in revision 2 which is attached.

good, so iam fine with the patch
whoever applies it should check that the regression tests still pass
and that its checked in correctly with svn cp

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

I am the wisest man alive, for I know one thing, and that is that I know
nothing. -- Socrates
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
URL: <http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/attachments/20090407/874477d0/attachment.pgp>



More information about the ffmpeg-devel mailing list