Fix FSF address and otherwise broken license headers.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21995 b3059339-0415-0410-9bf9-f77b7e298cf2

17 files changed, 32 insertions, 46 deletions

diff --git a/TOOLS/netstream/netstream.c b/TOOLS/netstream/netstream.c
index e222c04fb9..a2565a2b12 100644
--- a/TOOLS/netstream/netstream.c
+++ b/TOOLS/netstream/netstream.c
@@ -16,10 +16,8 @@
  *  GNU General Public License for more details.
  *   
  *  You should have received a copy of the GNU General Public License
- *  along with GNU Make; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *
- *
+ *  along with MPlayer; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <stdlib.h>
diff --git a/drivers/3dfx.h b/drivers/3dfx.h
index f2ac1a9220..eb0130ce38 100644
--- a/drivers/3dfx.h
+++ b/drivers/3dfx.h
@@ -15,10 +15,9 @@
  *  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 GNU Make; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *
+ *  You should have received a copy of the GNU General Public License along
+ *  with mpeg2dec; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 
diff --git a/libaf/af_surround.c b/libaf/af_surround.c
index 76b1b318e6..4b1cb9dac2 100644
--- a/libaf/af_surround.c
+++ b/libaf/af_surround.c
@@ -13,9 +13,9 @@
  * 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 this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
    Original author: Steve Davies <steve@daviesfam.org>
 */
diff --git a/libao2/ao_macosx.c b/libao2/ao_macosx.c
index 626bb16e91..591fee18fb 100644
--- a/libao2/ao_macosx.c
+++ b/libao2/ao_macosx.c
@@ -17,9 +17,9 @@
  *  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 GNU Make; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  You should have received a copy of the GNU General Public License along
+ *  with libao; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 /*
diff --git a/libmpcodecs/native/RTjpegN.c b/libmpcodecs/native/RTjpegN.c
index 315e01092c..c78c378565 100644
--- a/libmpcodecs/native/RTjpegN.c
+++ b/libmpcodecs/native/RTjpegN.c
@@ -18,8 +18,7 @@
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-    
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
 #include <stdio.h>
diff --git a/libmpcodecs/native/RTjpegN.h b/libmpcodecs/native/RTjpegN.h
index ca31de4ba4..98174a0b9c 100644
--- a/libmpcodecs/native/RTjpegN.h
+++ b/libmpcodecs/native/RTjpegN.h
@@ -18,8 +18,7 @@
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-    
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
 #define __u8 uint8_t
diff --git a/libmpcodecs/vf_kerndeint.c b/libmpcodecs/vf_kerndeint.c
index 4d66a3898d..ed41068a48 100644
--- a/libmpcodecs/vf_kerndeint.c
+++ b/libmpcodecs/vf_kerndeint.c
@@ -13,7 +13,7 @@
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
 #include <stdio.h>
diff --git a/libvo/jpeg_enc.c b/libvo/jpeg_enc.c
index 754a3eb05c..777de1517c 100644
--- a/libvo/jpeg_enc.c
+++ b/libvo/jpeg_enc.c
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  *
  * For an excellent introduction to the JPEG format, see:
  * http://www.ece.purdue.edu/~bouman/grad-labs/lab8/pdf/lab.pdf
diff --git a/libvo/jpeg_enc.h b/libvo/jpeg_enc.h
index 27f1af6033..2c04cc0847 100644
--- a/libvo/jpeg_enc.h
+++ b/libvo/jpeg_enc.h
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  *
  * For an excellent introduction to the JPEG format, see:
  * http://www.ece.purdue.edu/~bourman/grad-labs/lab8/pdf/lab.pdf
diff --git a/libvo/video_out_internal.h b/libvo/video_out_internal.h
index c01467ba17..58329dfdee 100644
--- a/libvo/video_out_internal.h
+++ b/libvo/video_out_internal.h
@@ -16,9 +16,8 @@
  *  GNU General Public License for more details.
  *   
  *  You should have received a copy of the GNU General Public License
- *  along with GNU Make; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *
+ *  along with mpeg2dec; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /* All video drivers will want this */
diff --git a/libvo/vo_3dfx.c b/libvo/vo_3dfx.c
index 4759a40833..28f60cd787 100644
--- a/libvo/vo_3dfx.c
+++ b/libvo/vo_3dfx.c
@@ -17,9 +17,8 @@
  *  GNU General Public License for more details.
  *   
  *  You should have received a copy of the GNU General Public License
- *  along with GNU Make; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *
+ *  along with mpeg2dec; 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/libvo/vo_null.c b/libvo/vo_null.c
index 4214bec55d..88259f23d1 100644
--- a/libvo/vo_null.c
+++ b/libvo/vo_null.c
@@ -16,9 +16,8 @@
  *  GNU General Public License for more details.
  *   
  *  You should have received a copy of the GNU General Public License
- *  along with GNU Make; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *
+ *  along with mpeg2dec; 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/libvo/vo_syncfb.c b/libvo/vo_syncfb.c
index c36933560d..a6b965e264 100644
--- a/libvo/vo_syncfb.c
+++ b/libvo/vo_syncfb.c
@@ -20,9 +20,8 @@
  *  GNU General Public License for more details.
  *   
  *  You should have received a copy of the GNU General Public License
- *  along with GNU Make; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *
+ *  along with mpeg2dec; 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/libvo/vo_tdfx_vid.c b/libvo/vo_tdfx_vid.c
index 3401fc2ac8..01fd3626ca 100644
--- a/libvo/vo_tdfx_vid.c
+++ b/libvo/vo_tdfx_vid.c
@@ -15,10 +15,9 @@
  *  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 GNU Make; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *
+ *  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>
diff --git a/stream/stream_dvb.c b/stream/stream_dvb.c
index 9c950bef3c..a7f6aeff2f 100644
--- a/stream/stream_dvb.c
+++ b/stream/stream_dvb.c
@@ -23,7 +23,7 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 */
 
diff --git a/stream/stream_netstream.c b/stream/stream_netstream.c
index 78af5d632f..f4b97b8c66 100644
--- a/stream/stream_netstream.c
+++ b/stream/stream_netstream.c
@@ -16,10 +16,8 @@
  *  GNU General Public License for more details.
  *   
  *  You should have received a copy of the GNU General Public License
- *  along with GNU Make; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *
- *
+ *  along with MPlayer; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /*
diff --git a/stream/stream_vstream.c b/stream/stream_vstream.c
index 8ee017a29a..16af1c1c84 100644
--- a/stream/stream_vstream.c
+++ b/stream/stream_vstream.c
@@ -16,10 +16,8 @@
  *  GNU General Public License for more details.
  *   
  *  You should have received a copy of the GNU General Public License
- *  along with GNU Make; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *
- *
+ *  along with MPlayer; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /*