[FFmpeg-devel] [PATCH 1/2] x86/float_dsp.asm: restore author attribution

Michael Niedermayer michaelni at gmx.at
Sat Jun 9 16:11:31 CEST 2012


On Sat, Jun 09, 2012 at 09:15:08AM +0000, Paul B Mahol wrote:
> On 6/8/12, Michael Niedermayer <michaelni at gmx.at> wrote:
> > The attribution was removed by libav while moving the code to libavutil
> >
> > The original code is from
> > commit eb4825b5d43bb6ecfae4d64688f9e2d2ac075263
> > Author: Loren Merritt <lorenm at u.washington.edu>
> > Date:   Thu Aug 10 19:06:25 2006 +0000
> >
> >     sse and 3dnow implementations of float->int conversion and mdct
> > windowing.
> >     15% faster vorbis.
> >
> > and
> >
> > commit 069720565ce0f2cc94fa2474f30d155b2755e350
> > Author: Loren Merritt <lorenm at u.washington.edu>
> > Date:   Fri Aug 11 18:19:37 2006 +0000
> >
> >     vorbis simd tweaks
> >
> > Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> > ---
> >  libavutil/x86/float_dsp.asm |   10 ++++++----
> >  1 file changed, 6 insertions(+), 4 deletions(-)
> >
> > diff --git a/libavutil/x86/float_dsp.asm b/libavutil/x86/float_dsp.asm
> > index 53be7ab..6ed716c 100644
> > --- a/libavutil/x86/float_dsp.asm
> > +++ b/libavutil/x86/float_dsp.asm
> > @@ -1,20 +1,22 @@
> > ;*****************************************************************************
> >  ;* x86-optimized Float DSP functions
> >  ;*
> > -;* This file is part of Libav.
> > +;* Copyright 2006 Loren Merritt
> >  ;*
> > -;* Libav is free software; you can redistribute it and/or
> > +;* 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.
> >  ;*
> > -;* Libav is distributed in the hope that it will be useful,
> > +;* 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 Libav; if not, write to the Free Software
> > +;* License along with FFmpeg; if not, write to the Free Software
> >  ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
> > USA
> > ;******************************************************************************
> >
> > --
> > 1.7.9.5
> >
> 
> LGTM

applied

thanks

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

The worst form of inequality is to try to make unequal things equal.
-- Aristotle
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20120609/caf555ff/attachment.asc>


More information about the ffmpeg-devel mailing list