[FFmpeg-devel] Google Summer of Code participation
Mon Apr 6 21:28:43 CEST 2009
On Mon, Apr 06, 2009 at 05:46:37PM +0200, Thilo Borgmann wrote:
> Michael Niedermayer schrieb:
>> On Mon, Apr 06, 2009 at 02:15:52PM +0200, Thilo Borgmann wrote:
>>> Michael Niedermayer schrieb:
>>>> we of course need a diff that represents the difference between 2
>>>> not a diff between 2 files of the same revission
>>> I still need feedback on this. What do I have to provide?
>> a diff that can be applied
>> patches always must be between 2 points in a branch
>> so if for example a changeset is made of 3 patches
>> applying them in order should work
>> a patch between 2 files of the same revission is not usefull
> Thank you. I 'touch'ed a new file libavcodec/avpacket.c (and commited it to
> my local working copy) which now appears in the patch. I hope this way is
> what you want (although I don't know what happens if a file in the diff
> does not yet exist when the patch is applied).
> Of course, this is a follow up patch to the movedAgain patch. I attach both
> for convienience.
> 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
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
In a rich man's house there is no place to spit but his face.
-- Diogenes of Sinope
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Size: 189 bytes
Desc: Digital signature
More information about the ffmpeg-devel