Merge remote-tracking branch 'qatar/master'

* qatar/master: Move misplaced file author information where it belongs Conflicts: libavcodec/adpcm.c libavcodec/adpcmenc.c libavcodec/gif.c libavcodec/x86/dsputilenc_mmx.c libavcodec/x86/fmtconvert_init.c libavformat/au.c libavformat/gif.c libavformat/mov.c libavformat/nsvdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago · 580a0600ef
parent ad9e66a565 ac9362c5d9
commit 580a0600ef
9 changed files with 31 additions and 32 deletions
--- a/libavcodec/adpcm.c
+++ b/libavcodec/adpcm.c
@ -1,6 +1,18 @@
 /*
 * Copyright (c) 2001-2003 The ffmpeg Project
 *
+ * first version by Francois Revol (revol@free.fr)
+ * fringe ADPCM codecs (e.g., DK3, DK4, Westwood)
+ *   by Mike Melanson (melanson@pcisys.net)
+ * CD-ROM XA ADPCM codec by BERO
+ * EA ADPCM decoder by Robin Kay (komadori@myrealbox.com)
+ * EA ADPCM R1/R2/R3 decoder by Peter Ross (pross@xvid.org)
+ * EA IMA EACS decoder by Peter Ross (pross@xvid.org)
+ * EA IMA SEAD decoder by Peter Ross (pross@xvid.org)
+ * EA ADPCM XAS decoder by Peter Ross (pross@xvid.org)
+ * MAXIS EA ADPCM decoder by Robert Marston (rmarston@gmail.com)
+ * THP ADPCM decoder by Marco Gerards (mgerards@xs4all.nl)
+ *
 * This file is part of FFmpeg.
 *
 * FFmpeg is free software; you can redistribute it and/or
@ -28,18 +40,6 @@
 /**
 * @file
 * ADPCM decoders
- * First version by Francois Revol (revol@free.fr)
- * Fringe ADPCM codecs (e.g., DK3, DK4, Westwood)
- *   by Mike Melanson (melanson@pcisys.net)
- * CD-ROM XA ADPCM codec by BERO
- * EA ADPCM decoder by Robin Kay (komadori@myrealbox.com)
- * EA ADPCM R1/R2/R3 decoder by Peter Ross (pross@xvid.org)
- * EA IMA EACS decoder by Peter Ross (pross@xvid.org)
- * EA IMA SEAD decoder by Peter Ross (pross@xvid.org)
- * EA ADPCM XAS decoder by Peter Ross (pross@xvid.org)
- * MAXIS EA ADPCM decoder by Robert Marston (rmarston@gmail.com)
- * THP ADPCM decoder by Marco Gerards (mgerards@xs4all.nl)
- *
 * Features and limitations:
 *
 * Reference documents:
--- a/libavcodec/adpcmenc.c
+++ b/libavcodec/adpcmenc.c
@ -1,6 +1,10 @@
 /*
 * Copyright (c) 2001-2003 The ffmpeg Project
 *
+ * first version by Francois Revol (revol@free.fr)
+ * fringe ADPCM codecs (e.g., DK3, DK4, Westwood)
+ *   by Mike Melanson (melanson@pcisys.net)
+ *
 * This file is part of FFmpeg.
 *
 * FFmpeg is free software; you can redistribute it and/or
@ -28,10 +32,6 @@
 /**
 * @file
 * ADPCM encoders
- * First version by Francois Revol (revol@free.fr)
- * Fringe ADPCM codecs (e.g., DK3, DK4, Westwood)
- *   by Mike Melanson (melanson@pcisys.net)
- *
 * See ADPCM decoder reference documents for codec information.
 */

--- a/libavcodec/gif.c
+++ b/libavcodec/gif.c
@ -4,6 +4,8 @@
 * Copyright (c) 2002 Francois Revol
 * Copyright (c) 2006 Baptiste Coudurier
 *
+ * first version by Francois Revol <revol@free.fr>
+ *
 * This file is part of FFmpeg.
 *
 * FFmpeg is free software; you can redistribute it and/or
@ -22,8 +24,6 @@
 */

 /*
- * First version by Francois Revol revol@free.fr
- *
 * Features and limitations:
 * - uses only a global standard palette
 * - tested with IE 5.0, Opera for BeOS, NetPositive (BeOS), and Mozilla (BeOS).
--- a/libavcodec/x86/dsputilenc_mmx.c
+++ b/libavcodec/x86/dsputilenc_mmx.c
@ -3,6 +3,8 @@
 * Copyright (c) 2000, 2001 Fabrice Bellard
 * Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at>
 *
+ * MMX optimization by Nick Kurshev <nickols_k@mail.ru>
+ *
 * 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
- *
- * MMX optimization by Nick Kurshev <nickols_k@mail.ru>
 */

 #include "libavutil/attributes.h"
--- a/libavcodec/x86/fmtconvert_init.c
+++ b/libavcodec/x86/fmtconvert_init.c
@ -3,6 +3,8 @@
 * Copyright (c) 2000, 2001 Fabrice Bellard
 * Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at>
 *
+ * MMX optimization by Nick Kurshev <nickols_k@mail.ru>
+ *
 * 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
- *
- * MMX optimization by Nick Kurshev <nickols_k@mail.ru>
 */

 #include "libavutil/attributes.h"
--- a/libavformat/au.c
+++ b/libavformat/au.c
@ -2,6 +2,8 @@
 * AU muxer and demuxer
 * Copyright (c) 2001 Fabrice Bellard
 *
+ * first version by Francois Revol <revol@free.fr>
+ *
 * This file is part of FFmpeg.
 *
 * FFmpeg is free software; you can redistribute it and/or
@ -20,8 +22,6 @@
 */

 /*
- * First version by Francois Revol revol@free.fr
- *
 * Reference documents:
 * http://www.opengroup.org/public/pubs/external/auformat.html
 * http://www.goice.co.jp/member/mo/formats/au.html
--- a/libavformat/gif.c
+++ b/libavformat/gif.c
@ -2,6 +2,8 @@
 * Animated GIF muxer
 * Copyright (c) 2000 Fabrice Bellard
 *
+ * first version by Francois Revol <revol@free.fr>
+ *
 * This file is part of FFmpeg.
 *
 * FFmpeg is free software; you can redistribute it and/or
@ -20,8 +22,6 @@
 */

 /*
- * First version by Francois Revol revol@free.fr
- *
 * Features and limitations:
 * - currently no compression is performed,
 *   in fact the size of the data is 9/8 the size of the image in 8bpp
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@ -3,6 +3,9 @@
 * Copyright (c) 2001 Fabrice Bellard
 * Copyright (c) 2009 Baptiste Coudurier <baptiste dot coudurier at gmail dot com>
 *
+ * first version by Francois Revol <revol@free.fr>
+ * seek function by Gael Chardon <gael.dev@4now.net>
+ *
 * This file is part of FFmpeg.
 *
 * FFmpeg is free software; you can redistribute it and/or
@ -48,11 +51,6 @@
 #include <zlib.h>
 #endif

-/*
- * First version by Francois Revol revol@free.fr
- * Seek function by Gael Chardon gael.dev@4now.net
- */
-
 #include "qtpalette.h"


--- a/libavformat/nsvdec.c
+++ b/libavformat/nsvdec.c
@ -2,6 +2,8 @@
 * NSV demuxer
 * Copyright (c) 2004 The FFmpeg Project
 *
+ * first version by Francois Revol <revol@free.fr>
+ *
 * This file is part of FFmpeg.
 *
 * FFmpeg is free software; you can redistribute it and/or
@ -37,7 +39,6 @@
 #define NSV_MAX_RESYNC_TRIES 300

 /*
- * First version by Francois Revol - revol@free.fr
 * References:
 * (1) http://www.multimedia.cx/nsv-format.txt
 * seems someone came to the same conclusions as me, and updated it: