From 7b94177e37c328490da96727a395a3aa90a402f3 Mon Sep 17 00:00:00 2001 From: Diego Biurrun <diego@biurrun.de> Date: Thu, 5 Jul 2007 10:37:29 +0000 Subject: [PATCH] Group all copyright and author notices together. Originally committed as revision 9483 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/alpha/simple_idct_alpha.c | 12 ++-- libavcodec/armv4l/simple_idct_arm.S | 6 +- libavcodec/bitstream.c | 4 +- libavcodec/cyuv.c | 10 ++-- libavcodec/dsputil.c | 4 +- libavcodec/faandct.c | 4 +- libavcodec/h263.c | 8 +-- libavcodec/huffyuv.c | 6 +- libavcodec/i386/dsputil_mmx_avg.h | 8 +-- libavcodec/i386/dsputil_mmx_qns.h | 6 +- libavcodec/i386/dsputil_mmx_rnd.h | 8 +-- libavcodec/i386/idct_mmx_xvid.c | 90 +++++++++++++--------------- libavcodec/i386/motion_est_mmx.c | 4 +- libavcodec/i386/mpegvideo_mmx.c | 6 +- libavcodec/ljpegenc.c | 8 +-- libavcodec/mdec.c | 4 +- libavcodec/mjpeg.c | 8 +-- libavcodec/mjpeg.h | 8 +-- libavcodec/mjpegdec.c | 8 +-- libavcodec/mjpegenc.c | 8 +-- libavcodec/mjpegenc.h | 8 +-- libavcodec/motion_est.c | 3 +- libavcodec/mpegvideo.c | 4 +- libavcodec/mpegvideo_common.h | 4 +- libavcodec/mpegvideo_enc.c | 4 +- libavcodec/msmpeg4.c | 4 +- libavcodec/msmpeg4data.c | 4 +- libavcodec/msmpeg4data.h | 4 +- libavcodec/msmpeg4tab.h | 4 +- libavcodec/ps2/dsputil_mmi.c | 6 +- libavcodec/ps2/mpegvideo_mmi.c | 4 +- libavcodec/s3tc.c | 4 +- libavcodec/svq1.c | 11 ++-- libavcodec/svq1_cb.h | 7 +-- libavcodec/txd.c | 4 +- libavcodec/vp6.c | 11 ++-- libavformat/flvdec.c | 11 ++-- libavutil/md5.c | 22 +++---- 38 files changed, 161 insertions(+), 178 deletions(-) diff --git a/libavcodec/alpha/simple_idct_alpha.c b/libavcodec/alpha/simple_idct_alpha.c index 7c4a0d578e2..c1d47082a13 100644 --- a/libavcodec/alpha/simple_idct_alpha.c +++ b/libavcodec/alpha/simple_idct_alpha.c @@ -3,6 +3,12 @@ * * Copyright (c) 2001 Michael Niedermayer <michaelni@gmx.at> * + * based upon some outcommented C code from mpeg2dec (idct_mmx.c + * written by Aaron Holtzman <aholtzma@ess.engr.uvic.ca>) + * + * Alpha optimizations by Måns Rullgård <mru@users.sourceforge.net> + * and Falk Hueffner <falk@debian.org> + * * This file is part of FFmpeg. * * FFmpeg is free software; you can redistribute it and/or @@ -18,12 +24,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 - * - * based upon some outcommented c code from mpeg2dec (idct_mmx.c - * written by Aaron Holtzman <aholtzma@ess.engr.uvic.ca>) - * - * Alpha optimiziations by Måns Rullgård <mru@users.sourceforge.net> - * and Falk Hueffner <falk@debian.org> */ #include "asm.h" diff --git a/libavcodec/armv4l/simple_idct_arm.S b/libavcodec/armv4l/simple_idct_arm.S index b5a20f6da0a..40b017ff0b0 100644 --- a/libavcodec/armv4l/simple_idct_arm.S +++ b/libavcodec/armv4l/simple_idct_arm.S @@ -5,6 +5,9 @@ * * Author: Frederic Boulay <dilb@handhelds.org> * + * The function defined in this file is derived from the simple_idct function + * from the libavcodec library part of the FFmpeg project. + * * This file is part of FFmpeg. * * FFmpeg is free software; you can redistribute it and/or @@ -20,9 +23,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 - * - * The function defined in this file, is derived from the simple_idct function - * from the libavcodec library part of the ffmpeg project. */ /* useful constants for the algorithm, they are save in __constant_ptr__ at */ diff --git a/libavcodec/bitstream.c b/libavcodec/bitstream.c index 271a393b22e..8e5d15acebf 100644 --- a/libavcodec/bitstream.c +++ b/libavcodec/bitstream.c @@ -3,6 +3,8 @@ * Copyright (c) 2000, 2001 Fabrice Bellard. * Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at> * + * alternative bitstream reader & writer 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 - * - * alternative bitstream reader & writer by Michael Niedermayer <michaelni@gmx.at> */ /** diff --git a/libavcodec/cyuv.c b/libavcodec/cyuv.c index b607da0a295..a1a750902e5 100644 --- a/libavcodec/cyuv.c +++ b/libavcodec/cyuv.c @@ -1,4 +1,8 @@ /* + * Creative YUV (CYUV) Video Decoder + * by Mike Melanson (melanson@pcisys.net) + * based on "Creative YUV (CYUV) stream format for AVI": + * http://www.csse.monash.edu.au/~timf/videocodec/cyuv.txt * * Copyright (C) 2003 the ffmpeg project * @@ -17,12 +21,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 - * - * Creative YUV (CYUV) Video Decoder - * by Mike Melanson (melanson@pcisys.net) - * based on "Creative YUV (CYUV) stream format for AVI": - * http://www.csse.monash.edu.au/~timf/videocodec/cyuv.txt - * */ /** diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c index 838edd07f01..cf089572033 100644 --- a/libavcodec/dsputil.c +++ b/libavcodec/dsputil.c @@ -3,6 +3,8 @@ * Copyright (c) 2000, 2001 Fabrice Bellard. * Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at> * + * gmc & q-pel & 32/64 bit based MC 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 - * - * gmc & q-pel & 32/64 bit based MC by Michael Niedermayer <michaelni@gmx.at> */ /** diff --git a/libavcodec/faandct.c b/libavcodec/faandct.c index 6f73ee5e974..772c8f2ca73 100644 --- a/libavcodec/faandct.c +++ b/libavcodec/faandct.c @@ -2,6 +2,8 @@ * Floating point AAN DCT * Copyright (c) 2003 Michael Niedermayer <michaelni@gmx.at> * + * this implementation is based upon the IJG integer AAN DCT (see jfdctfst.c) + * * This file is part of FFmpeg. * * FFmpeg is free software; you can redistribute it and/or @@ -17,8 +19,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 - * - * this implementation is based upon the IJG integer AAN DCT (see jfdctfst.c) */ /** diff --git a/libavcodec/h263.c b/libavcodec/h263.c index 18b38569095..7a57ae96452 100644 --- a/libavcodec/h263.c +++ b/libavcodec/h263.c @@ -5,6 +5,10 @@ * Copyright (c) 2001 Juan J. Sierralta P. * Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at> * + * ac prediction encoding, B-frame support, error resilience, optimizations, + * qpel decoding, gmc decoding, interlaced decoding + * by Michael Niedermayer <michaelni@gmx.at> + * * This file is part of FFmpeg. * * FFmpeg is free software; you can redistribute it and/or @@ -20,10 +24,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 - * - * ac prediction encoding, b-frame support, error resilience, optimizations, - * qpel decoding, gmc decoding, interlaced decoding, - * by Michael Niedermayer <michaelni@gmx.at> */ /** diff --git a/libavcodec/huffyuv.c b/libavcodec/huffyuv.c index ac91db213dc..d48c1e1df29 100644 --- a/libavcodec/huffyuv.c +++ b/libavcodec/huffyuv.c @@ -3,6 +3,9 @@ * * Copyright (c) 2002-2003 Michael Niedermayer <michaelni@gmx.at> * + * see http://www.pcisys.net/~melanson/codecs/huffyuv.txt for a description of + * the algorithm used + * * This file is part of FFmpeg. * * FFmpeg is free software; you can redistribute it and/or @@ -18,9 +21,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 - * - * see http://www.pcisys.net/~melanson/codecs/huffyuv.txt for a description of - * the algorithm used */ /** diff --git a/libavcodec/i386/dsputil_mmx_avg.h b/libavcodec/i386/dsputil_mmx_avg.h index ec5d2b59064..d37d3006464 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 d0030d80360..06bcb6d7ba4 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 d706bef1861..601800a9e09 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 1e7ea3e7fae..179defdd1a6 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 e43cacdcc2f..3c223938712 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 112c57cb6af..8b7e62c673c 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" diff --git a/libavcodec/ljpegenc.c b/libavcodec/ljpegenc.c index 7c9cde80bb8..0e717397bf3 100644 --- a/libavcodec/ljpegenc.c +++ b/libavcodec/ljpegenc.c @@ -4,6 +4,10 @@ * Copyright (c) 2003 Alex Beregszaszi * Copyright (c) 2003-2004 Michael Niedermayer * + * Support for external huffman table, various fixes (AVID workaround), + * aspecting, new decode_frame mechanism and apple mjpeg-b support + * by Alex Beregszaszi + * * This file is part of FFmpeg. * * FFmpeg is free software; you can redistribute it and/or @@ -19,10 +23,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 - * - * Support for external huffman table, various fixes (AVID workaround), - * aspecting, new decode_frame mechanism and apple mjpeg-b support - * by Alex Beregszaszi */ /** diff --git a/libavcodec/mdec.c b/libavcodec/mdec.c index 1f63bbd7b7c..318b3b927bc 100644 --- a/libavcodec/mdec.c +++ b/libavcodec/mdec.c @@ -2,6 +2,8 @@ * PSX MDEC codec * Copyright (c) 2003 Michael Niedermayer * + * based upon code from Sebastian Jedruszkiewicz <elf@frogger.rules.pl> + * * This file is part of FFmpeg. * * FFmpeg is free software; you can redistribute it and/or @@ -17,8 +19,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 - * - * based upon code from Sebastian Jedruszkiewicz <elf@frogger.rules.pl> */ /** diff --git a/libavcodec/mjpeg.c b/libavcodec/mjpeg.c index 4be987b2cf3..08ffb95a7c5 100644 --- a/libavcodec/mjpeg.c +++ b/libavcodec/mjpeg.c @@ -4,6 +4,10 @@ * Copyright (c) 2003 Alex Beregszaszi * Copyright (c) 2003-2004 Michael Niedermayer * + * Support for external huffman table, various fixes (AVID workaround), + * aspecting, new decode_frame mechanism and apple mjpeg-b support + * by Alex Beregszaszi + * * This file is part of FFmpeg. * * FFmpeg is free software; you can redistribute it and/or @@ -19,10 +23,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 - * - * Support for external huffman table, various fixes (AVID workaround), - * aspecting, new decode_frame mechanism and apple mjpeg-b support - * by Alex Beregszaszi */ /** diff --git a/libavcodec/mjpeg.h b/libavcodec/mjpeg.h index ec14dd45982..e63b314dea3 100644 --- a/libavcodec/mjpeg.h +++ b/libavcodec/mjpeg.h @@ -4,6 +4,10 @@ * Copyright (c) 2003 Alex Beregszaszi * Copyright (c) 2003-2004 Michael Niedermayer * + * Support for external huffman table, various fixes (AVID workaround), + * aspecting, new decode_frame mechanism and apple mjpeg-b support + * by Alex Beregszaszi + * * This file is part of FFmpeg. * * FFmpeg is free software; you can redistribute it and/or @@ -19,10 +23,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 - * - * Support for external huffman table, various fixes (AVID workaround), - * aspecting, new decode_frame mechanism and apple mjpeg-b support - * by Alex Beregszaszi */ /** diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 81e3cb44c05..f70d9b262d0 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -4,6 +4,10 @@ * Copyright (c) 2003 Alex Beregszaszi * Copyright (c) 2003-2004 Michael Niedermayer * + * Support for external huffman table, various fixes (AVID workaround), + * aspecting, new decode_frame mechanism and apple mjpeg-b support + * by Alex Beregszaszi + * * This file is part of FFmpeg. * * FFmpeg is free software; you can redistribute it and/or @@ -19,10 +23,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 - * - * Support for external huffman table, various fixes (AVID workaround), - * aspecting, new decode_frame mechanism and apple mjpeg-b support - * by Alex Beregszaszi */ /** diff --git a/libavcodec/mjpegenc.c b/libavcodec/mjpegenc.c index bf780436f15..b5e5a827d3a 100644 --- a/libavcodec/mjpegenc.c +++ b/libavcodec/mjpegenc.c @@ -4,6 +4,10 @@ * Copyright (c) 2003 Alex Beregszaszi * Copyright (c) 2003-2004 Michael Niedermayer * + * Support for external huffman table, various fixes (AVID workaround), + * aspecting, new decode_frame mechanism and apple mjpeg-b support + * by Alex Beregszaszi + * * This file is part of FFmpeg. * * FFmpeg is free software; you can redistribute it and/or @@ -19,10 +23,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 - * - * Support for external huffman table, various fixes (AVID workaround), - * aspecting, new decode_frame mechanism and apple mjpeg-b support - * by Alex Beregszaszi */ /** diff --git a/libavcodec/mjpegenc.h b/libavcodec/mjpegenc.h index a313eac9077..d6f1ec9d24b 100644 --- a/libavcodec/mjpegenc.h +++ b/libavcodec/mjpegenc.h @@ -4,6 +4,10 @@ * Copyright (c) 2003 Alex Beregszaszi * Copyright (c) 2003-2004 Michael Niedermayer * + * Support for external huffman table, various fixes (AVID workaround), + * aspecting, new decode_frame mechanism and apple mjpeg-b support + * by Alex Beregszaszi + * * This file is part of FFmpeg. * * FFmpeg is free software; you can redistribute it and/or @@ -19,10 +23,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 - * - * Support for external huffman table, various fixes (AVID workaround), - * aspecting, new decode_frame mechanism and apple mjpeg-b support - * by Alex Beregszaszi */ /** diff --git a/libavcodec/motion_est.c b/libavcodec/motion_est.c index 014e3c5f448..16db0f87c9e 100644 --- a/libavcodec/motion_est.c +++ b/libavcodec/motion_est.c @@ -3,6 +3,7 @@ * Copyright (c) 2000,2001 Fabrice Bellard. * Copyright (c) 2002-2004 Michael Niedermayer * + * new motion estimation (X1/EPZS) by Michael Niedermayer <michaelni@gmx.at> * * This file is part of FFmpeg. * @@ -19,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 - * - * new Motion Estimation (X1/EPZS) by Michael Niedermayer <michaelni@gmx.at> */ /** diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index db11d96afcf..68ee6125d1a 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -3,6 +3,8 @@ * Copyright (c) 2000,2001 Fabrice Bellard. * Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at> * + * 4MV & hq & B-frame encoding stuff 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 - * - * 4MV & hq & b-frame encoding stuff by Michael Niedermayer <michaelni@gmx.at> */ /** diff --git a/libavcodec/mpegvideo_common.h b/libavcodec/mpegvideo_common.h index 7fc1ee52b78..5ba4ad1c8d2 100644 --- a/libavcodec/mpegvideo_common.h +++ b/libavcodec/mpegvideo_common.h @@ -3,6 +3,8 @@ * Copyright (c) 2000,2001 Fabrice Bellard. * Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at> * + * 4MV & hq & B-frame encoding stuff 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 - * - * 4MV & hq & b-frame encoding stuff by Michael Niedermayer <michaelni@gmx.at> */ /** diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 204a51cbbbf..2ac8a6fc68f 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -3,6 +3,8 @@ * Copyright (c) 2000,2001 Fabrice Bellard. * Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at> * + * 4MV & hq & B-frame encoding stuff 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 - * - * 4MV & hq & b-frame encoding stuff by Michael Niedermayer <michaelni@gmx.at> */ /** diff --git a/libavcodec/msmpeg4.c b/libavcodec/msmpeg4.c index ba58798e7da..fec804b029b 100644 --- a/libavcodec/msmpeg4.c +++ b/libavcodec/msmpeg4.c @@ -3,6 +3,8 @@ * Copyright (c) 2001 Fabrice Bellard. * Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at> * + * msmpeg4v1 & v2 stuff 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 - * - * msmpeg4v1 & v2 stuff by Michael Niedermayer <michaelni@gmx.at> */ /** diff --git a/libavcodec/msmpeg4data.c b/libavcodec/msmpeg4data.c index a2cb7f64f88..90a8ade83b9 100644 --- a/libavcodec/msmpeg4data.c +++ b/libavcodec/msmpeg4data.c @@ -3,6 +3,8 @@ * copyright (c) 2001 Fabrice Bellard * copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at> * + * msmpeg4v1 & v2 stuff 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 - * - * msmpeg4v1 & v2 stuff by Michael Niedermayer <michaelni@gmx.at> */ /** diff --git a/libavcodec/msmpeg4data.h b/libavcodec/msmpeg4data.h index c32fc5dd469..24cb47dff58 100644 --- a/libavcodec/msmpeg4data.h +++ b/libavcodec/msmpeg4data.h @@ -3,6 +3,8 @@ * copyright (c) 2001 Fabrice Bellard * copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at> * + * msmpeg4v1 & v2 stuff 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 - * - * msmpeg4v1 & v2 stuff by Michael Niedermayer <michaelni@gmx.at> */ /** diff --git a/libavcodec/msmpeg4tab.h b/libavcodec/msmpeg4tab.h index 6a1c3c38cd3..19d4753ee49 100644 --- a/libavcodec/msmpeg4tab.h +++ b/libavcodec/msmpeg4tab.h @@ -3,6 +3,8 @@ * copyright (c) 2001 Fabrice Bellard * copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at> * + * msmpeg4v1 & v2 stuff 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 - * - * msmpeg4v1 & v2 stuff by Michael Niedermayer <michaelni@gmx.at> */ /** diff --git a/libavcodec/ps2/dsputil_mmi.c b/libavcodec/ps2/dsputil_mmi.c index 22ee5cea86a..6a0582fe446 100644 --- a/libavcodec/ps2/dsputil_mmi.c +++ b/libavcodec/ps2/dsputil_mmi.c @@ -2,6 +2,9 @@ * MMI optimized DSP utils * Copyright (c) 2000, 2001 Fabrice Bellard. * + * MMI optimization by Leon van Stuivenberg + * clear_blocks_mmi() by BroadQ + * * 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 - * - * MMI optimization by Leon van Stuivenberg - * clear_blocks_mmi() by BroadQ */ #include "dsputil.h" diff --git a/libavcodec/ps2/mpegvideo_mmi.c b/libavcodec/ps2/mpegvideo_mmi.c index dff8be7fd00..7f62e6e6d23 100644 --- a/libavcodec/ps2/mpegvideo_mmi.c +++ b/libavcodec/ps2/mpegvideo_mmi.c @@ -1,6 +1,8 @@ /* * Copyright (c) 2000,2001 Fabrice Bellard. * + * MMI optimization by Leon van Stuivenberg + * * This file is part of FFmpeg. * * FFmpeg is free software; you can redistribute it and/or @@ -16,8 +18,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 - * - * MMI optimization by Leon van Stuivenberg */ #include "dsputil.h" diff --git a/libavcodec/s3tc.c b/libavcodec/s3tc.c index 544ee42b255..bc8e3d26568 100644 --- a/libavcodec/s3tc.c +++ b/libavcodec/s3tc.c @@ -2,6 +2,8 @@ * S3 Texture Compression (S3TC) decoding functions * Copyright (c) 2007 by Ivo van Poorten * + * see also: http://wiki.multimedia.cx/index.php?title=S3TC + * * This file is part of FFmpeg. * * FFmpeg is free software; you can redistribute it and/or @@ -17,8 +19,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 - * - * See also: http://wiki.multimedia.cx/index.php?title=S3TC */ #include "avcodec.h" diff --git a/libavcodec/svq1.c b/libavcodec/svq1.c index 3414264105d..7d709f38018 100644 --- a/libavcodec/svq1.c +++ b/libavcodec/svq1.c @@ -1,8 +1,13 @@ /* + * SVQ1 decoder + * ported to MPlayer by Arpi <arpi@thot.banki.hu> + * ported to libavcodec by Nick Kurshev <nickols_k@mail.ru> * * Copyright (C) 2002 the xine project * Copyright (C) 2002 the ffmpeg project * + * SVQ1 Encoder (c) 2004 Mike Melanson <melanson@pcisys.net> + * * This file is part of FFmpeg. * * FFmpeg is free software; you can redistribute it and/or @@ -18,12 +23,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 - * - * (SVQ1 Decoder) - * Ported to mplayer by Arpi <arpi@thot.banki.hu> - * Ported to libavcodec by Nick Kurshev <nickols_k@mail.ru> - * - * SVQ1 Encoder (c) 2004 Mike Melanson <melanson@pcisys.net> */ /** diff --git a/libavcodec/svq1_cb.h b/libavcodec/svq1_cb.h index a0e74952d99..bd2f98d10fd 100644 --- a/libavcodec/svq1_cb.h +++ b/libavcodec/svq1_cb.h @@ -1,4 +1,7 @@ /* + * SVQ1 decoder + * ported to MPlayer by Arpi <arpi@thot.banki.hu> + * ported to libavcodec by Nick Kurshev <nickols_k@mail.ru> * * Copyright (C) 2002 the xine project * Copyright (C) 2002 the ffmpeg project @@ -18,10 +21,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 - * - * Ported to mplayer by Arpi <arpi@thot.banki.hu> - * Ported to libavcodec by Nick Kurshev <nickols_k@mail.ru> - * */ /** diff --git a/libavcodec/txd.c b/libavcodec/txd.c index 454e412955a..9c60b4c03fe 100644 --- a/libavcodec/txd.c +++ b/libavcodec/txd.c @@ -2,6 +2,8 @@ * Renderware TeXture Dictionary (.txd) image decoder * Copyright (c) 2007 Ivo van Poorten * + * See also: http://wiki.multimedia.cx/index.php?title=TXD + * * This file is part of FFmpeg. * * FFmpeg is free software; you can redistribute it and/or @@ -17,8 +19,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 - * - * See also: http://wiki.multimedia.cx/index.php?title=TXD */ #include "avcodec.h" diff --git a/libavcodec/vp6.c b/libavcodec/vp6.c index 065b9ff3052..cfa7589d355 100644 --- a/libavcodec/vp6.c +++ b/libavcodec/vp6.c @@ -4,6 +4,10 @@ * * Copyright (C) 2006 Aurelien Jacobs <aurel@gnuage.org> * + * The VP6F decoder accepts an optional 1 byte extradata. It is composed of: + * - upper 4bits: difference between encoded width and visible width + * - lower 4bits: difference between encoded height and visible height + * * This file is part of FFmpeg. * * FFmpeg is free software; you can redistribute it and/or @@ -18,12 +22,7 @@ * * 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 St, Fifth Floor, Boston, MA 02110-1301 USA - * - * - * The VP6F decoder accept an optional 1 byte extradata. It is composed of: - * - upper 4bits: difference between encoded width and visible width - * - lower 4bits: difference between encoded height and visible height + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include <stdlib.h> diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index 1f8035d8592..676bb27169b 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -2,6 +2,11 @@ * FLV demuxer * Copyright (c) 2003 The FFmpeg Project. * + * This demuxer will generate a 1 byte extradata for VP6F content. + * It is composed of: + * - upper 4bits: difference between encoded width and visible width + * - lower 4bits: difference between encoded height and visible height + * * This file is part of FFmpeg. * * FFmpeg is free software; you can redistribute it and/or @@ -17,12 +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 - * - * - * This demuxer will generate a 1 byte extradata for VP6F content. - * It is composed of: - * - upper 4bits: difference between encoded width and visible width - * - lower 4bits: difference between encoded height and visible height */ #include "avformat.h" #include "flv.h" diff --git a/libavutil/md5.c b/libavutil/md5.c index 96c3d257077..6c23ed642f5 100644 --- a/libavutil/md5.c +++ b/libavutil/md5.c @@ -2,6 +2,17 @@ * Copyright (C) 2006 Michael Niedermayer (michaelni@gmx.at) * Copyright (C) 2003-2005 by Christopher R. Hertel (crh@ubiqx.mn.org) * + * References: + * IETF RFC 1321: The MD5 Message-Digest Algorithm + * Ron Rivest. IETF, April, 1992 + * + * based on http://ubiqx.org/libcifs/source/Auth/MD5.c + * from Christopher R. Hertel (crh@ubiqx.mn.org) + * Simplified, cleaned and IMO redundant comments removed by michael. + * + * If you use gcc, then version 4.1 or later and -fomit-frame-pointer is + * strongly recommended. + * * This file is part of FFmpeg. * * FFmpeg is free software; you can redistribute it and/or @@ -17,17 +28,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 - * - * References: - * IETF RFC 1321: The MD5 Message-Digest Algorithm - * Ron Rivest. IETF, April, 1992 - * - * based on http://ubiqx.org/libcifs/source/Auth/MD5.c - * from Christopher R. Hertel (crh@ubiqx.mn.org) - * simplified, cleaned and IMO redundant comments removed by michael - * - * if you use gcc, then version 4.1 or later and -fomit-frame-pointer is - * strongly recommended */ #include "common.h" -- GitLab