Merge svn changes up to r27573

Conflicts:
	libmpcodecs/vd_ffmpeg.c

5 files changed, 88 insertions, 21 deletions

diff --git a/libao2/ao_arts.c b/libao2/ao_arts.c
index 092fe20dd4..30db48fb22 100644
--- a/libao2/ao_arts.c
+++ b/libao2/ao_arts.c
@@ -1,10 +1,23 @@
 /*
- * ao_arts - aRts audio output driver for MPlayer
+ * aRts audio output driver for MPlayer
  *
- * Michele Balistreri <brain87@gmx.net>
+ * copyright (c) 2002 Michele Balistreri <brain87@gmx.net>
  *
- * This driver is distribuited under terms of GPL
+ * This file is part of MPlayer.
  *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #include <artsc.h>
diff --git a/libao2/ao_esd.c b/libao2/ao_esd.c
index 3eb1c2a8bd..56a73ff555 100644
--- a/libao2/ao_esd.c
+++ b/libao2/ao_esd.c
@@ -1,10 +1,26 @@
 /*
- * ao_esd - EsounD audio output driver for MPlayer
+ * EsounD audio output driver for MPlayer
  *
- * Juergen Keil <jk@tools.de>
+ * copyright (c) 2002 Juergen Keil <jk@tools.de>
  *
- * This driver is distributed under the terms of the GPL
+ * This file is part of MPlayer.
  *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+ /*
  * TODO / known problems:
  * - does not work well when the esd daemon has autostandby disabled
  *   (workaround: run esd with option "-as 2" - fortunatelly this is
diff --git a/libao2/ao_jack.c b/libao2/ao_jack.c
index 70f9bfad1b..e4ac6910b2 100644
--- a/libao2/ao_jack.c
+++ b/libao2/ao_jack.c
@@ -1,11 +1,24 @@
-/* 
- * ao_jack.c - libao2 JACK Audio Output Driver for MPlayer
- *
- * This driver is under the same license as MPlayer.
- * (http://www.mplayerhq.hu)
+/*
+ * JACK audio output driver for MPlayer
  *
  * Copyleft 2001 by Felix Bünemann (atmosfear@users.sf.net)
  * and Reimar Döffinger (Reimar.Doeffinger@stud.uni-karlsruhe.de)
+ *
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * along with MPlayer; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <stdio.h>
diff --git a/libao2/ao_openal.c b/libao2/ao_openal.c
index 579de7aa1d..c91694dc05 100644
--- a/libao2/ao_openal.c
+++ b/libao2/ao_openal.c
@@ -1,10 +1,23 @@
-/* 
- * ao_openal.c - OpenAL audio output driver for MPlayer
- *
- * This driver is under the same license as MPlayer.
- * (http://www.mplayerhq.hu)
+/*
+ * OpenAL audio output driver for MPlayer
  *
  * Copyleft 2006 by Reimar Döffinger (Reimar.Doeffinger@stud.uni-karlsruhe.de)
+ *
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * along with MPlayer; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include "config.h"
diff --git a/libao2/ao_sdl.c b/libao2/ao_sdl.c
index 24c2f0668e..2da0073da7 100644
--- a/libao2/ao_sdl.c
+++ b/libao2/ao_sdl.c
@@ -1,13 +1,25 @@
-/* 
- * ao_sdl.c - libao2 SDLlib Audio Output Driver for MPlayer
- *
- * This driver is under the same license as MPlayer.
- * (http://www.mplayerhq.hu)
+/*
+ * SDLlib audio output driver for MPlayer
  *
  * Copyleft 2001 by Felix Bünemann (atmosfear@users.sf.net)
  *
  * Thanks to Arpi for nice ringbuffer-code!
  *
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * along with MPlayer; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <stdio.h>