Merge FSF address changes from 1.1 branch.

--HG--
rename : src/combined/decoder_flac.c => src/combined/flac_decoder.c
rename : src/combined/demux_flac.c => src/combined/flac_demuxer.c
rename : src/libxineadec/nsf.c => src/combined/nsf_decoder.c
rename : src/demuxers/demux_nsf.c => src/combined/nsf_demuxer.c
rename : src/combined/combined_wavpack.c => src/combined/wavpack_combined.c
rename : src/combined/combined_wavpack.h => src/combined/wavpack_combined.h
rename : src/combined/decoder_wavpack.c => src/combined/wavpack_decoder.c
rename : src/combined/demux_wavpack.c => src/combined/wavpack_demuxer.c
rename : src/demuxers/demux_ogg.c => src/combined/xine_ogg_demuxer.c
rename : src/libxineadec/xine_speex_decoder.c => src/combined/xine_speex_decoder.c
rename : src/libxinevdec/xine_theora_decoder.c => src/combined/xine_theora_decoder.c
rename : src/libxineadec/xine_vorbis_decoder.c => src/combined/xine_vorbis_decoder.c
rename : src/liba52/xine_a52_decoder.c => src/libxineadec/xine_a52_decoder.c
rename : src/libdts/xine_dts_decoder.c => src/libxineadec/xine_dts_decoder.c
rename : src/libfaad/xine_faad_decoder.c => src/libxineadec/xine_faad_decoder.c
rename : src/libmusepack/xine_musepack_decoder.c => src/libxineadec/xine_musepack_decoder.c

11 files changed, 11 insertions, 11 deletions

diff --git a/src/post/planar/boxblur.c b/src/post/planar/boxblur.c
index 1644d2046..e84329ba1 100644
--- a/src/post/planar/boxblur.c
+++ b/src/post/planar/boxblur.c
@@ -15,7 +15,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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
  *
  * $Id: boxblur.c,v 1.14 2006/01/27 07:46:14 tmattern Exp $
  *
diff --git a/src/post/planar/denoise3d.c b/src/post/planar/denoise3d.c
index 370ab4e23..9c457bb49 100644
--- a/src/post/planar/denoise3d.c
+++ b/src/post/planar/denoise3d.c
@@ -15,7 +15,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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
  *
  * $Id: denoise3d.c,v 1.14 2006/01/27 07:46:14 tmattern Exp $
  *
diff --git a/src/post/planar/eq.c b/src/post/planar/eq.c
index 8c7b00e4b..ddd8a5392 100644
--- a/src/post/planar/eq.c
+++ b/src/post/planar/eq.c
@@ -15,7 +15,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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
  *
  * $Id: eq.c,v 1.15 2007/03/22 23:32:05 dgp85 Exp $
  *
diff --git a/src/post/planar/eq2.c b/src/post/planar/eq2.c
index 38f9117db..63dc44495 100644
--- a/src/post/planar/eq2.c
+++ b/src/post/planar/eq2.c
@@ -15,7 +15,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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
  *
  * $Id: eq2.c,v 1.18 2007/03/22 23:32:05 dgp85 Exp $
  *
diff --git a/src/post/planar/expand.c b/src/post/planar/expand.c
index cf288921f..67d449153 100644
--- a/src/post/planar/expand.c
+++ b/src/post/planar/expand.c
@@ -15,7 +15,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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
  *
  * $Id: 
  *
diff --git a/src/post/planar/fill.c b/src/post/planar/fill.c
index 1fdc2ad8b..c9e1722fa 100644
--- a/src/post/planar/fill.c
+++ b/src/post/planar/fill.c
@@ -15,7 +15,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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
  *
  * $Id: fill.c,v 1.1 2005/07/18 18:02:51 jstembridge Exp $
  *
diff --git a/src/post/planar/invert.c b/src/post/planar/invert.c
index 77f7c54d1..2907c0e80 100644
--- a/src/post/planar/invert.c
+++ b/src/post/planar/invert.c
@@ -15,7 +15,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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
  *
  * $Id: invert.c,v 1.20 2004/04/17 19:54:32 mroi Exp $
  */
diff --git a/src/post/planar/noise.c b/src/post/planar/noise.c
index a5bf03039..7973240f2 100644
--- a/src/post/planar/noise.c
+++ b/src/post/planar/noise.c
@@ -15,7 +15,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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
  *
  * $Id: noise.c,v 1.4 2007/03/22 23:32:05 dgp85 Exp $
  *
diff --git a/src/post/planar/planar.c b/src/post/planar/planar.c
index 5f4363e2f..8a3faddb9 100644
--- a/src/post/planar/planar.c
+++ b/src/post/planar/planar.c
@@ -15,7 +15,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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
  *
  * $Id: planar.c,v 1.13 2006/07/10 22:08:44 dgp85 Exp $
  *
diff --git a/src/post/planar/pp.c b/src/post/planar/pp.c
index c66e40459..b1f32f47f 100755
--- a/src/post/planar/pp.c
+++ b/src/post/planar/pp.c
@@ -15,7 +15,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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
  *
  * $Id: pp.c,v 1.9 2006/01/27 07:46:14 tmattern Exp $
  *
diff --git a/src/post/planar/unsharp.c b/src/post/planar/unsharp.c
index 161104a64..b8f52cac9 100644
--- a/src/post/planar/unsharp.c
+++ b/src/post/planar/unsharp.c
@@ -15,7 +15,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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
  *
  * $Id: unsharp.c,v 1.18 2006/01/27 07:46:14 tmattern Exp $
  *