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>

diff --cc libavcodec/adpcm.c
index 3f8cfbcf53e49e98183251eb0321f4dcbfb8a4c3,950284946e30326b87bf28dd1c435862f6226bed..f5af5d479b1d50aa14b818f3c4225be64283b6de
--- 1/libavcodec/adpcm.c
--- 2/libavcodec/adpcm.c
+++ b/libavcodec/adpcm.c
@@@ -1,9 -1,21 +1,21 @@@
  /*
   * Copyright (c) 2001-2003 The ffmpeg Project
   *
 - * This file is part of Libav.
+  * 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.
   *
 - * Libav is free software; you can redistribute it and/or
 + * 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.

diff --cc libavcodec/adpcmenc.c
index 762cf673a15bd8d69a181ac7deaca6e319b0be08,14b1257966f96ad64911cfc1210dac02e25a1bc4..cef8b6f9162e27a19c9c1867bda0ff7d0a01af5f
--- 1/libavcodec/adpcmenc.c
--- 2/libavcodec/adpcmenc.c
+++ b/libavcodec/adpcmenc.c
@@@ -1,9 -1,13 +1,13 @@@
  /*
   * Copyright (c) 2001-2003 The ffmpeg Project
   *
 - * This file is part of Libav.
+  * 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.
   *
 - * Libav is free software; you can redistribute it and/or
 + * 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.

diff --cc libavcodec/gif.c
index de3e576b3d639db6c08c8e9ff55a9c9082e5fc92,8705e743dad31eab4fe57f966dfeae68c41ab117..98ab767c4091ca958d901c09289833deb3b7d680
--- 1/libavcodec/gif.c
--- 2/libavcodec/gif.c
+++ b/libavcodec/gif.c
@@@ -4,9 -4,11 +4,11 @@@
   * Copyright (c) 2002 Francois Revol
   * Copyright (c) 2006 Baptiste Coudurier
   *
 - * This file is part of Libav.
+  * first version by Francois Revol <revol@free.fr>
+  *
 + * This file is part of FFmpeg.
   *
 - * Libav is free software; you can redistribute it and/or
 + * 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.
@@@ -22,9 -24,9 +24,7 @@@
   */
  
  /*
-  * 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
   * - uses only a global standard palette
   * - tested with IE 5.0, Opera for BeOS, NetPositive (BeOS), and Mozilla (BeOS).
   *

diff --cc libavcodec/x86/dsputilenc_mmx.c
index a3f268e7a88dd59041b33c6fabad773c6d9ab1bc,67db52c8737a99562b45be450422d823ceacf043..06186e2fde577641994ed9922694f3f52d4f70b7
--- 1/libavcodec/x86/dsputilenc_mmx.c
--- 2/libavcodec/x86/dsputilenc_mmx.c
+++ b/libavcodec/x86/dsputilenc_mmx.c
@@@ -3,9 -3,11 +3,11 @@@
   * Copyright (c) 2000, 2001 Fabrice Bellard
   * Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at>
   *
 - * This file is part of Libav.
+  * MMX optimization by Nick Kurshev <nickols_k@mail.ru>
+  *
 + * This file is part of FFmpeg.
   *
 - * Libav is free software; you can redistribute it and/or
 + * 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.
@@@ -16,10 -18,8 +18,8 @@@
   * 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
-  *
-  * MMX optimization by Nick Kurshev <nickols_k@mail.ru>
   */
  
  #include "libavutil/attributes.h"

diff --cc libavcodec/x86/fmtconvert_init.c
index 4a4c0170b723b91bf78a9ea37de56e9e7408254c,24c81bdbe06871a81f2ef989ac6ae035438ff27c..91a4cb7af11f51cf0198bd7cd8674a89f8bf1857
--- 1/libavcodec/x86/fmtconvert_init.c
--- 2/libavcodec/x86/fmtconvert_init.c
+++ b/libavcodec/x86/fmtconvert_init.c
@@@ -3,9 -3,11 +3,11 @@@
   * Copyright (c) 2000, 2001 Fabrice Bellard
   * Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at>
   *
 - * This file is part of Libav.
+  * MMX optimization by Nick Kurshev <nickols_k@mail.ru>
+  *
 + * This file is part of FFmpeg.
   *
 - * Libav is free software; you can redistribute it and/or
 + * 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.
@@@ -16,10 -18,8 +18,8 @@@
   * 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
-  *
-  * MMX optimization by Nick Kurshev <nickols_k@mail.ru>
   */
  
  #include "libavutil/attributes.h"

diff --cc libavformat/au.c
index a29e80203b1e0b22e92bf7a6b079751b8ac59524,6b252b21cebfe1640981f1055b6c31ca91a242f6..22004d0c35fd2d30b4220759cdde2bd717e65f50
--- 1/libavformat/au.c
--- 2/libavformat/au.c
+++ b/libavformat/au.c
@@@ -2,9 -2,11 +2,11 @@@
   * AU muxer and demuxer
   * Copyright (c) 2001 Fabrice Bellard
   *
 - * This file is part of Libav.
+  * first version by Francois Revol <revol@free.fr>
+  *
 + * This file is part of FFmpeg.
   *
 - * Libav is free software; you can redistribute it and/or
 + * 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.

diff --cc libavformat/gif.c
index 31b01018ad0813fe329d81c5e9825213b52bb8c4,2b1e93ad9f2c504b43e03ca0a25ee84dfc14fbe1..97ebf1b48e04cd960f558dd4909db20295f3db9d
--- 1/libavformat/gif.c
--- 2/libavformat/gif.c
+++ b/libavformat/gif.c
@@@ -2,9 -2,11 +2,11 @@@
   * Animated GIF muxer
   * Copyright (c) 2000 Fabrice Bellard
   *
 - * This file is part of Libav.
+  * first version by Francois Revol <revol@free.fr>
+  *
 + * This file is part of FFmpeg.
   *
 - * Libav is free software; you can redistribute it and/or
 + * 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.

diff --cc libavformat/mov.c
index 3c54ef3834bc5844261a404c445d92961d8f29da,291c14227cd7f0841eb5bb262534f2ef86a7029b..3e48f15e20d99419f992c442b2ebd0fad4bf3669
--- 1/libavformat/mov.c
--- 2/libavformat/mov.c
+++ b/libavformat/mov.c
@@@ -3,9 -3,12 +3,12 @@@
   * Copyright (c) 2001 Fabrice Bellard
   * Copyright (c) 2009 Baptiste Coudurier <baptiste dot coudurier at gmail dot com>
   *
 - * This file is part of Libav.
+  * first version by Francois Revol <revol@free.fr>
+  * seek function by Gael Chardon <gael.dev@4now.net>
+  *
 + * This file is part of FFmpeg.
   *
 - * Libav is free software; you can redistribute it and/or
 + * 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.

diff --cc libavformat/nsvdec.c
index bcc2180019d8be327196ad3d752d2a14e1479b73,7698f55bb1c88d067a9284e1549ff698a3edf4b5..e582f0f6cca1478a3b8caab5b4357cf524760558
--- 1/libavformat/nsvdec.c
--- 2/libavformat/nsvdec.c
+++ b/libavformat/nsvdec.c
@@@ -1,10 -1,12 +1,12 @@@
  /*
   * NSV demuxer
 - * Copyright (c) 2004 The Libav Project
 + * Copyright (c) 2004 The FFmpeg Project
   *
 - * This file is part of Libav.
+  * first version by Francois Revol <revol@free.fr>
+  *
 + * This file is part of FFmpeg.
   *
 - * Libav is free software; you can redistribute it and/or
 + * 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.