diff options
author | Diego Biurrun <diego@biurrun.de> | 2007-07-05 10:37:29 +0000 |
---|---|---|
committer | Diego Biurrun <diego@biurrun.de> | 2007-07-05 10:37:29 +0000 |
commit | 7b94177e37c328490da96727a395a3aa90a402f3 (patch) | |
tree | b7cc0d8730da870668f179ecf79ca7c09d025a70 /libavcodec/i386 | |
parent | b19bcbaa78a99691d24f89cb2447f8517f06cf81 (diff) | |
download | ffmpeg-streaming-7b94177e37c328490da96727a395a3aa90a402f3.zip ffmpeg-streaming-7b94177e37c328490da96727a395a3aa90a402f3.tar.gz |
Group all copyright and author notices together.
Originally committed as revision 9483 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/i386')
-rw-r--r-- | libavcodec/i386/dsputil_mmx_avg.h | 8 | ||||
-rw-r--r-- | libavcodec/i386/dsputil_mmx_qns.h | 6 | ||||
-rw-r--r-- | libavcodec/i386/dsputil_mmx_rnd.h | 8 | ||||
-rw-r--r-- | libavcodec/i386/idct_mmx_xvid.c | 90 | ||||
-rw-r--r-- | libavcodec/i386/motion_est_mmx.c | 4 | ||||
-rw-r--r-- | libavcodec/i386/mpegvideo_mmx.c | 6 |
6 files changed, 56 insertions, 66 deletions
diff --git a/libavcodec/i386/dsputil_mmx_avg.h b/libavcodec/i386/dsputil_mmx_avg.h index ec5d2b5..d37d300 100644 --- a/libavcodec/i386/dsputil_mmx_avg.h +++ b/libavcodec/i386/dsputil_mmx_avg.h @@ -3,6 +3,10 @@ * Copyright (c) 2000, 2001 Fabrice Bellard. * Copyright (c) 2002-2004 Michael Niedermayer * + * MMX optimization by Nick Kurshev <nickols_k@mail.ru> + * mostly rewritten by Michael Niedermayer <michaelni@gmx.at> + * and improved by Zdenek Kabelac <kabi@users.sf.net> + * * This file is part of FFmpeg. * * FFmpeg is free software; you can redistribute it and/or @@ -18,10 +22,6 @@ * 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 - * - * MMX optimization by Nick Kurshev <nickols_k@mail.ru> - * mostly rewritten by Michael Niedermayer <michaelni@gmx.at> - * and improved by Zdenek Kabelac <kabi@users.sf.net> */ /* XXX: we use explicit registers to avoid a gcc 2.95.2 register asm diff --git a/libavcodec/i386/dsputil_mmx_qns.h b/libavcodec/i386/dsputil_mmx_qns.h index d0030d8..06bcb6d 100644 --- a/libavcodec/i386/dsputil_mmx_qns.h +++ b/libavcodec/i386/dsputil_mmx_qns.h @@ -2,6 +2,9 @@ * DSP utils : QNS functions are compiled 3 times for mmx/3dnow/ssse3 * Copyright (c) 2004 Michael Niedermayer * + * MMX optimization by Michael Niedermayer <michaelni@gmx.at> + * 3DNow! and SSSE3 optimization by Zuxy Meng <zuxy.meng@gmail.com> + * * This file is part of FFmpeg. * * FFmpeg is free software; you can redistribute it and/or @@ -17,9 +20,6 @@ * 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 - * - * MMX optimization by Michael Niedermayer <michaelni@gmx.at> - * 3DNow! and SSSE3 optimization by Zuxy Meng <zuxy.meng@gmail.com> */ #define MAX_ABS (512 >> (SCALE_OFFSET>0 ? SCALE_OFFSET : 0)) diff --git a/libavcodec/i386/dsputil_mmx_rnd.h b/libavcodec/i386/dsputil_mmx_rnd.h index d706bef..601800a 100644 --- a/libavcodec/i386/dsputil_mmx_rnd.h +++ b/libavcodec/i386/dsputil_mmx_rnd.h @@ -3,6 +3,10 @@ * Copyright (c) 2000, 2001 Fabrice Bellard. * Copyright (c) 2003-2004 Michael Niedermayer <michaelni@gmx.at> * + * MMX optimization by Nick Kurshev <nickols_k@mail.ru> + * mostly rewritten by Michael Niedermayer <michaelni@gmx.at> + * and improved by Zdenek Kabelac <kabi@users.sf.net> + * * This file is part of FFmpeg. * * FFmpeg is free software; you can redistribute it and/or @@ -18,10 +22,6 @@ * 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 - * - * MMX optimization by Nick Kurshev <nickols_k@mail.ru> - * mostly rewritten by Michael Niedermayer <michaelni@gmx.at> - * and improved by Zdenek Kabelac <kabi@users.sf.net> */ // put_pixels diff --git a/libavcodec/i386/idct_mmx_xvid.c b/libavcodec/i386/idct_mmx_xvid.c index 1e7ea3e..179defd 100644 --- a/libavcodec/i386/idct_mmx_xvid.c +++ b/libavcodec/i386/idct_mmx_xvid.c @@ -1,53 +1,43 @@ -///**************************************************************************** -// * -// * XVID MPEG-4 VIDEO CODEC -// * - MMX and XMM forward discrete cosine transform - -// * -// * Copyright(C) 2001 Peter Ross <pross@xvid.org> -// * -// * 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 -// * -// * $Id$ -// * -// ***************************************************************************/ - -// **************************************************************************** -// -// Originally provided by Intel at AP-922 -// http://developer.intel.com/vtune/cbts/strmsimd/922down.htm -// (See more app notes at http://developer.intel.com/vtune/cbts/strmsimd/appnotes.htm) -// but in a limited edition. -// New macro implements a column part for precise iDCT -// The routine precision now satisfies IEEE standard 1180-1990. -// -// Copyright(C) 2000-2001 Peter Gubanov <peter@elecard.net.ru> -// Rounding trick Copyright(C) 2000 Michel Lespinasse <walken@zoy.org> -// -// http://www.elecard.com/peter/idct.html -// http://www.linuxvideo.org/mpeg2dec/ -// -// ***************************************************************************/ -// -// These examples contain code fragments for first stage iDCT 8x8 -// (for rows) and first stage DCT 8x8 (for columns) -// - -// conversion to gcc syntax by michael niedermayer - +/* + * XVID MPEG-4 VIDEO CODEC + * - MMX and XMM forward discrete cosine transform - + * + * Copyright(C) 2001 Peter Ross <pross@xvid.org> + * + * Originally provided by Intel at AP-922 + * http://developer.intel.com/vtune/cbts/strmsimd/922down.htm + * (See more app notes at http://developer.intel.com/vtune/cbts/strmsimd/appnotes.htm) + * but in a limited edition. + * New macro implements a column part for precise iDCT + * The routine precision now satisfies IEEE standard 1180-1990. + * + * Copyright(C) 2000-2001 Peter Gubanov <peter@elecard.net.ru> + * Rounding trick Copyright(C) 2000 Michel Lespinasse <walken@zoy.org> + * + * http://www.elecard.com/peter/idct.html + * http://www.linuxvideo.org/mpeg2dec/ + * + * These examples contain code fragments for first stage iDCT 8x8 + * (for rows) and first stage DCT 8x8 (for columns) + * + * conversion to gcc syntax by Michael Niedermayer + * + * 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 <inttypes.h> #include "avcodec.h" diff --git a/libavcodec/i386/motion_est_mmx.c b/libavcodec/i386/motion_est_mmx.c index e43cacd..3c22393 100644 --- a/libavcodec/i386/motion_est_mmx.c +++ b/libavcodec/i386/motion_est_mmx.c @@ -3,6 +3,8 @@ * Copyright (c) 2001 Fabrice Bellard. * Copyright (c) 2002-2004 Michael Niedermayer * + * mostly by Michael Niedermayer <michaelni@gmx.at> + * * This file is part of FFmpeg. * * FFmpeg is free software; you can redistribute it and/or @@ -18,8 +20,6 @@ * 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 - * - * mostly by Michael Niedermayer <michaelni@gmx.at> */ #include "dsputil.h" #include "x86_cpu.h" diff --git a/libavcodec/i386/mpegvideo_mmx.c b/libavcodec/i386/mpegvideo_mmx.c index 112c57c..8b7e62c 100644 --- a/libavcodec/i386/mpegvideo_mmx.c +++ b/libavcodec/i386/mpegvideo_mmx.c @@ -2,6 +2,9 @@ * The simplest mpeg encoder (well, it was the simplest!) * Copyright (c) 2000,2001 Fabrice Bellard. * + * Optimized for ia32 CPUs by Nick Kurshev <nickols_k@mail.ru> + * h263, mpeg1, mpeg2 dequantizer & draw_edges by Michael Niedermayer <michaelni@gmx.at> + * * This file is part of FFmpeg. * * FFmpeg is free software; you can redistribute it and/or @@ -17,9 +20,6 @@ * 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 - * - * Optimized for ia32 cpus by Nick Kurshev <nickols_k@mail.ru> - * h263, mpeg1, mpeg2 dequantizer & draw_edges by Michael Niedermayer <michaelni@gmx.at> */ #include "dsputil.h" |