[FFmpeg-devel] Google Summer of Code participation

[Thilo Borgmann]

Michael Niedermayer schrieb:
> On Sun, Apr 05, 2009 at 11:41:03PM +0200, Thilo Borgmann wrote:
>   
>> Ronald S. Bultje schrieb:
>>     
>>> Hi,
>>>
>>> On Sun, Apr 5, 2009 at 4:20 PM, Thilo Borgmann
>>> <thilo.borgmann at googlemail.com> wrote:
>>>   
>>>       
>>>> Michael Niedermayer schrieb:
>>>>     
>>>>         
>>>>> it would be nice to in addition see the diff between utils.c and
>>>>> avpacket.c to make sure nothing was unintentionally changed
>>>>>       
>>>>>           
>>> [..]
>>>   
>>>       
>>>> A manual "diff -up" makes no sense to me as it shows a lot of lines hard 
>>>> to
>>>> read... please tell me how to generate what you want to see.
>>>>     
>>>>         
>>> One way to do it (spartanic, but works): diff -u old_file new_file,
>>> and then basically just making sure that nothing changed with in the
>>> AVPacket code, so:
>>>
>>> @@ ...
>>> - all these lines
>>> - and so on
>>> - bla bla bla
>>>
>>>   typedef struct AVPacket {
>>>       /* bla bla
>>> @@ ... < - HERE - >
>>>     int last_member_of_avpacket;
>>>   } AVPacket;
>>>
>>> - bla bla bla
>>> - rest of file
>>> - and so on
>>>
>>> There should be nothing additionally changed (cosmetics, spaces,
>>> typos, etc.) in the <- HERE -> part within the AVPacket struct
>>> declaration (and the functions that you copied, etc.).
>>>
>>>   
>>>       
>> Thanks, although it is not about the AVPacket struct anymore but about the 
>> new avpacket.c.
>> Ok, I did a attach the "diff -up libavformat/utils.c libavcodec/avpacket.c" 
>> (utilsXavpacket.diff) although it breaks up the function, see yourselves. I 
>>     
>
> we of course need a diff that represents the difference between 2 revissions
> not a diff between 2 files of the same revission
>
>   
Ah, so revision-diff of libavformat/utils.c? Can do... but as avpacket 
is not realy there, just local, a git diff returns nothing. Hmm... I 
think I'm still not getting it right because the diff for the 
libavformat/utils.c is in the patch and the avpacket.c also attached... ?
> [...]
>   
>> --- libavformat/utils.c	2009-04-05 23:11:38.000000000 +0200
>> +++ libavcodec/avpacket.c	2009-04-05 23:16:26.000000000 +0200
>> @@ -1,6 +1,7 @@
>>  /*
>> - * various utility functions for use within FFmpeg
>> - * Copyright (c) 2000, 2001, 2002 Fabrice Bellard
>> + * AVPacket functions for libavcodec
>> + * Copyright (c) 2001 Fabrice Bellard
>> + * Copyright (c) 2002-2004 Michael Niedermayer <michaelni at gmx.at>
>>     
>
> why did fabrice loose 2 years?
>
>   
Because I copied copyright & licence from libavcodec/utils.c where he 
never had these years...


TB