Merge svn changes up to r28310

The libdvdread4 and libdvdnav directories, which are externals in the
svn repository, are at least for now not included in any form. I added
configure checks to automatically disable internal libdvdread and
libdvdnav if the corresponding directories are not present; if they're
added manually then things work the same as in svn.

36 files changed, 731 insertions, 276 deletions

diff --git a/libaf/af.c b/libaf/af.c
index 06e2a065d2..77fda8e320 100644
--- a/libaf/af.c
+++ b/libaf/af.c
@@ -1,3 +1,21 @@
+/*
+ * 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 <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/libaf/af.h b/libaf/af.h
index 8404e24848..1b2bde6ace 100644
--- a/libaf/af.h
+++ b/libaf/af.h
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ */
+
 #ifndef MPLAYER_AF_H
 #define MPLAYER_AF_H
 
diff --git a/libaf/af_center.c b/libaf/af_center.c
index dd9f624ebe..c24554436f 100644
--- a/libaf/af_center.c
+++ b/libaf/af_center.c
@@ -1,14 +1,29 @@
 /*
-    (C) Alex Beregszaszi
-    License: GPL
-    
-    This filter adds a center channel to the audio stream by
-    averaging the left and right channel.
-    There are two runtime controls one for setting which channel to
-    insert the center-audio into called AF_CONTROL_SUB_CH.
-
-    FIXME: implement a high-pass filter for better results.
-*/
+ * This filter adds a center channel to the audio stream by
+ * averaging the left and right channel.
+ * There are two runtime controls one for setting which channel
+ * to insert the center-audio into called AF_CONTROL_SUB_CH.
+ *
+ * FIXME: implement a high-pass filter for better results.
+ *
+ * copyright (c) 2005 Alex Beregszaszi
+ *
+ * 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 <stdio.h>
 #include <stdlib.h>
diff --git a/libaf/af_channels.c b/libaf/af_channels.c
index 772242038e..bc329c9b31 100644
--- a/libaf/af_channels.c
+++ b/libaf/af_channels.c
@@ -1,7 +1,25 @@
-/* Audio filter that adds and removes channels, according to the
-   command line parameter channels. It is stupid and can only add
-   silence or copy channels not mix or filter.
-*/
+/*
+ * Audio filter that adds and removes channels, according to the
+ * command line parameter channels. It is stupid and can only add
+ * silence or copy channels, not mix or filter.
+ *
+ * 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 <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/libaf/af_comp.c b/libaf/af_comp.c
index 0b77c7a025..0eef76c2f4 100644
--- a/libaf/af_comp.c
+++ b/libaf/af_comp.c
@@ -1,12 +1,22 @@
-/*=============================================================================
-//	
-//  This software has been released under the terms of the GNU General Public
-//  license. See http://www.gnu.org/copyleft/gpl.html for details.
-//
-//  Copyright 2002 Anders Johansson ajh@atri.curtin.edu.au
-//
-//=============================================================================
-*/
+/*
+ * Copyright (C) 2002 Anders Johansson ajh@atri.curtin.edu.au
+ *
+ * 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 <stdio.h>
 #include <stdlib.h>
diff --git a/libaf/af_delay.c b/libaf/af_delay.c
index 61bd77c24d..f754e736cd 100644
--- a/libaf/af_delay.c
+++ b/libaf/af_delay.c
@@ -1,7 +1,25 @@
-/* This audio filter delays the output signal for the different
-   channels and can be used for simple position panning. Extension for
-   this filter would be a reverb.
-*/
+/*
+ * This audio filter delays the output signal for the different
+ * channels and can be used for simple position panning.
+ * An extension for this filter would be a reverb.
+ *
+ * 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 <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/libaf/af_dummy.c b/libaf/af_dummy.c
index 3136dbb00f..19a765c66d 100644
--- a/libaf/af_dummy.c
+++ b/libaf/af_dummy.c
@@ -1,5 +1,24 @@
-/* The name speaks for itself this filter is a dummy and will not blow
-   up regardless of what you do with it. */
+/*
+ * The name speaks for itself. This filter is a dummy and will
+ * not blow up regardless of what you do with it.
+ *
+ * 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 <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/libaf/af_equalizer.c b/libaf/af_equalizer.c
index 5a92090d32..e9c95d98b9 100644
--- a/libaf/af_equalizer.c
+++ b/libaf/af_equalizer.c
@@ -1,18 +1,27 @@
-/*=============================================================================
-//	
-//  This software has been released under the terms of the GNU General Public
-//  license. See http://www.gnu.org/copyleft/gpl.html for details.
-//
-//  Copyright 2001 Anders Johansson ajh@atri.curtin.edu.au
-//
-//=============================================================================
-*/
-
-/* Equalizer filter, implementation of a 10 band time domain graphic
-   equalizer using IIR filters. The IIR filters are implemented using a
-   Direct Form II approach, but has been modified (b1 == 0 always) to
-   save computation.
-*/
+/*
+ * Equalizer filter, implementation of a 10 band time domain graphic
+ * equalizer using IIR filters. The IIR filters are implemented using a
+ * Direct Form II approach, but has been modified (b1 == 0 always) to
+ * save computation.
+ *
+ * Copyright (C) 2001 Anders Johansson ajh@atri.curtin.edu.au
+ *
+ * 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 <stdio.h>
 #include <stdlib.h>
diff --git a/libaf/af_export.c b/libaf/af_export.c
index 571507019d..cc32fac42d 100644
--- a/libaf/af_export.c
+++ b/libaf/af_export.c
@@ -1,11 +1,28 @@
-/* This audio filter exports the incomming signal to other processes
-   using memory mapping. Memory mapped area contains a header: 
-      int nch, 
-      int size, 
-      unsigned long long counter (updated every time the  contents of
-                                  the area changes),
-   the rest is payload (non-interleaved).
-*/
+/*
+ * This audio filter exports the incoming signal to other processes
+ * using memory mapping. The memory mapped area contains a header:
+ *   int nch,
+ *   int size,
+ *   unsigned long long counter (updated every time the  contents of
+ *                               the area changes),
+ * the rest is payload (non-interleaved).
+ *
+ * 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 <stdio.h>
 #include <stdlib.h>
diff --git a/libaf/af_extrastereo.c b/libaf/af_extrastereo.c
index 7159221d54..88d2557fd2 100644
--- a/libaf/af_extrastereo.c
+++ b/libaf/af_extrastereo.c
@@ -1,12 +1,22 @@
-/*=============================================================================
-//	
-//  This software has been released under the terms of the GNU General Public
-//  license. See http://www.gnu.org/copyleft/gpl.html for details.
-//
-//  Copyright 2004 Alex Beregszaszi & Pierre Lombard
-//
-//=============================================================================
-*/
+/*
+ * Copyright (C) 2004 Alex Beregszaszi & Pierre Lombard
+ *
+ * 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 <stdio.h>
 #include <stdlib.h>
diff --git a/libaf/af_format.c b/libaf/af_format.c
index bc6830ab58..fdac68147e 100644
--- a/libaf/af_format.c
+++ b/libaf/af_format.c
@@ -1,10 +1,24 @@
-/* This audio output filter changes the format of a data block. Valid
-   formats are: AFMT_U8, AFMT_S8, AFMT_S16_LE, AFMT_S16_BE
-   AFMT_U16_LE, AFMT_U16_BE, AFMT_S32_LE and AFMT_S32_BE.
-*/
-
-// Must be defined before any libc headers are included!
-#define _ISOC9X_SOURCE
+/*
+ * This audio filter changes the format of a data block. Valid
+ * formats are: AFMT_U8, AFMT_S8, AFMT_S16_LE, AFMT_S16_BE
+ * AFMT_U16_LE, AFMT_U16_BE, AFMT_S32_LE and AFMT_S32_BE.
+ *
+ * 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 <stdio.h>
 #include <stdlib.h>
@@ -29,8 +43,8 @@ long int lrintf(float);
 
 /* The below includes retrieves functions for converting to and from
    ulaw and alaw */ 
-#include "af_format_ulaw.c"
-#include "af_format_alaw.c"
+#include "af_format_ulaw.h"
+#include "af_format_alaw.h"
 
 // Switch endianness
 static void endian(void* in, void* out, int len, int bps);
diff --git a/libaf/af_format.h b/libaf/af_format.h
index dee7503dc2..49a25374ae 100644
--- a/libaf/af_format.h
+++ b/libaf/af_format.h
@@ -1,6 +1,24 @@
-/* The sample format system used lin libaf is based on bitmasks. The
-   format definition only refers to the storage format not the
-   resolution. */
+/*
+ * The sample format system used lin libaf is based on bitmasks.
+ * The format definition only refers to the storage format,
+ * not the resolution.
+ *
+ * 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.
+ */
 
 #ifndef MPLAYER_AF_FORMAT_H
 #define MPLAYER_AF_FORMAT_H
diff --git a/libaf/af_format_alaw.c b/libaf/af_format_alaw.h
index 2283a3f14b..bddf1a5374 100644
--- a/libaf/af_format_alaw.c
+++ b/libaf/af_format_alaw.h
@@ -1,18 +1,28 @@
-/*=============================================================================
-//	
-//  This software has been released under the terms of the GNU General Public
-//  license. See http://www.gnu.org/copyleft/gpl.html for details.
-//
-//  Copyright 2002 Anders Johansson ajh@watri.uwa.edu.au
-//
-//  This file is based on a part of libsndfile, the work of 
-//    Erik de Castro Lopo <erikd@zip.com.au> 
-//
-//=============================================================================
-*/
+/*
+ * Copyright (C) 2002 Anders Johansson ajh@watri.uwa.edu.au
+ *
+ * This file is based on a part of libsndfile, the work of
+ * Erik de Castro Lopo <erikd@zip.com.au>.
+ *
+ * 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.
+ */
 
-#ifndef AF_FORMAT_ALAW_C
-#define AF_FORMAT_ALAW_C
+#ifndef MPLAYER_AF_FORMAT_ALAW_H
+#define MPLAYER_AF_FORMAT_ALAW_H
 
 #include <inttypes.h>
 
@@ -311,4 +321,4 @@ static int to_alaw(void* in, void* out, int len, int bps, int format)
   }
   return AF_OK;
 }
-#endif /* AF_FORMAT_ALAW_C */
+#endif /* MPLAYER_AF_FORMAT_ALAW_H */
diff --git a/libaf/af_format_ulaw.c b/libaf/af_format_ulaw.h
index e6e62f1f55..ecf521398c 100644
--- a/libaf/af_format_ulaw.c
+++ b/libaf/af_format_ulaw.h
@@ -1,18 +1,28 @@
-/*=============================================================================
-//	
-//  This software has been released under the terms of the GNU General Public
-//  license. See http://www.gnu.org/copyleft/gpl.html for details.
-//
-//  Copyright 2002 Anders Johansson ajh@watri.uwa.edu.au
-//
-//  This file is based on a part of libsndfile, the work of 
-//    Erik de Castro Lopo <erikd@zip.com.au> 
-//
-//=============================================================================
-*/
+/*
+ * Copyright (C) 2002 Anders Johansson ajh@watri.uwa.edu.au
+ *
+ * This file is based on a part of libsndfile, the work of
+ * Erik de Castro Lopo <erikd@zip.com.au>.
+ *
+ * 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.
+ */
 
-#ifndef AF_FORMAT_ULAW_C
-#define AF_FORMAT_ULAW_C
+#ifndef MPLAYER_AF_FORMAT_ULAW_H
+#define MPLAYER_AF_FORMAT_ULAW_H
 
 #include <inttypes.h>
 
@@ -824,4 +834,4 @@ static int to_ulaw(void* in, void* out, int len, int bps, int format)
   return AF_OK;
 }
 
-#endif /* AF_FORMAT_ULAW_C */
+#endif /* MPLAYER_AF_FORMAT_ULAW_H */
diff --git a/libaf/af_gate.c b/libaf/af_gate.c
index f4d574a64e..26c7e8ad03 100644
--- a/libaf/af_gate.c
+++ b/libaf/af_gate.c
@@ -1,12 +1,22 @@
-/*=============================================================================
-//	
-//  This software has been released under the terms of the GNU General Public
-//  license. See http://www.gnu.org/copyleft/gpl.html for details.
-//
-//  Copyright 2002 Anders Johansson ajh@atri.curtin.edu.au
-//
-//=============================================================================
-*/
+/*
+ * Copyright (C) 2002 Anders Johansson ajh@atri.curtin.edu.au
+ *
+ * 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 <stdio.h>
 #include <stdlib.h>
diff --git a/libaf/af_hrtf.c b/libaf/af_hrtf.c
index fe16823b9f..6fc6035c08 100644
--- a/libaf/af_hrtf.c
+++ b/libaf/af_hrtf.c
@@ -1,7 +1,25 @@
-/* Experimental audio filter that mixes 5.1 and 5.1 with matrix
-   encoded rear channels into headphone signal using FIR filtering
-   with HRTF.
-*/
+/*
+ * Experimental audio filter that mixes 5.1 and 5.1 with matrix
+ * encoded rear channels into headphone signal using FIR filtering
+ * with HRTF.
+ *
+ * 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 <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/libaf/af_hrtf.h b/libaf/af_hrtf.h
index 0ddc5b343e..887310b57d 100644
--- a/libaf/af_hrtf.h
+++ b/libaf/af_hrtf.h
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ */
+
 #ifndef MPLAYER_AF_HRTF_H
 #define MPLAYER_AF_HRTF_H
 
diff --git a/libaf/af_karaoke.c b/libaf/af_karaoke.c
index 6524f0edd0..5239c74721 100644
--- a/libaf/af_karaoke.c
+++ b/libaf/af_karaoke.c
@@ -1,11 +1,25 @@
 /*
-    (c)2006 MPlayer / Reynaldo H. Verdejo Pinochet 
-	Based on code by Alex Beregszaszi for his 'center' filter
-	
-    License: GPL
-    
-    Simple voice removal filter
-*/
+ * simple voice removal filter
+ *
+ * copyright (c) 2006 Reynaldo H. Verdejo Pinochet
+ * Based on code by Alex Beregszaszi for his 'center' filter.
+ *
+ * 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 <stdio.h>
 #include <stdlib.h>
diff --git a/libaf/af_mp.h b/libaf/af_mp.h
index 3c10c9466d..29aca538e7 100644
--- a/