[FFmpeg-devel] [PATCH] Move AVOptions to specific options.c files in lavc and lavf

[Michael Niedermayer]

On Thu, Jan 08, 2009 at 09:57:36PM +0100, Stefano Sabatini wrote:
> On date Thursday 2009-01-08 12:59:57 +0100, Michael Niedermayer encoded:
> > On Thu, Jan 08, 2009 at 09:04:50AM +0100, Stefano Sabatini wrote:
> > > On date Thursday 2009-01-08 02:05:35 +0100, Michael Niedermayer encoded:
> > > > On Thu, Jan 08, 2009 at 01:32:04AM +0100, Stefano Sabatini wrote:
> > > > > Hi all,
> > > > > 
> > > > > the libavcodec/options.c file has been generated with svn copy, the
> > > > > libavformat/options.c was not IMHO worth of it since it is few lines.
> > > > > 
> > > > > This should help to reduce the clutter in the corresponding utils.c
> > > > > files.
> > > > 
> > > > 
> > > > [...]
> > > > > Index: libavcodec/options.c
> > > > > ===================================================================
> > > > > --- libavcodec/options.c	(revision 16492)
> > > > > +++ libavcodec/options.c	(working copy)
> > > > > @@ -1,8 +1,4 @@
> > > > >  /*
> > > > > - * utils 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
> > > > > @@ -21,368 +17,14 @@
> > > > [...]
> > > > > Index: libavformat/options.c
> > > > > ===================================================================
> > > > > --- libavformat/options.c	(revision 0)
> > > > > +++ libavformat/options.c	(revision 0)
> > > > > @@ -0,0 +1,83 @@
> > > > > +/*
> > > > > + * 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
> > > > > + */
> > > > 
> > > > your patches look strangely inconsistent
> > > 
> > > Do you mean that I should use svn copy even for libavformat too?
> > 
> > you are copying code, so yes
> 
> Fixed, regards.
> -- 
> FFmpeg = Frenzy Frightening Marvellous Powerful Educated Goblin
[...]

> Index: libavcodec/options.c
> ===================================================================
> --- libavcodec/options.c	(revision 16492)
> +++ libavcodec/options.c	(working copy)
> @@ -1,8 +1,4 @@
>  /*
> - * utils 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

no copyright anymore?


[...]

> Index: libavformat/options.c
> ===================================================================
> --- libavformat/options.c	(revision 16495)
> +++ libavformat/options.c	(working copy)
> @@ -1,7 +1,4 @@
>  /*
> - * various utility functions for use within FFmpeg
> - * Copyright (c) 2000, 2001, 2002 Fabrice Bellard
> - *
>   * This file is part of FFmpeg.
>   *
>   * FFmpeg is free software; you can redistribute it and/or

same

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

The educated differ from the uneducated as much as the living from the
dead. -- Aristotle 
-------------- 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/20090110/847085b6/attachment.pgp>