diff options
author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-11-09 18:13:33 +0100 |
---|---|---|
committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-11-09 18:13:33 +0100 |
commit | abe2009f72e09173643b3d098ef17d3171a8f633 (patch) | |
tree | 01fac5f7d5d1ab501e0c20061b6da4ffe4628365 /src | |
parent | 7626abc51a753ce512843e624d3bb4653ff514ce (diff) | |
parent | c8f3cd1faf678b64920ad62f1275b03aae0157a7 (diff) | |
download | xine-lib-abe2009f72e09173643b3d098ef17d3171a8f633.tar.gz xine-lib-abe2009f72e09173643b3d098ef17d3171a8f633.tar.bz2 |
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
Diffstat (limited to 'src')
340 files changed, 429 insertions, 380 deletions
diff --git a/src/audio_out/audio_alsa_out.c b/src/audio_out/audio_alsa_out.c index 3aef7978d..25f1df62f 100644 --- a/src/audio_out/audio_alsa_out.c +++ b/src/audio_out/audio_alsa_out.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 * * Credits go * - for the SPDIF A/52 sync part diff --git a/src/audio_out/audio_coreaudio_out.c b/src/audio_out/audio_coreaudio_out.c index 22f53c0ef..eecab8f95 100644 --- a/src/audio_out/audio_coreaudio_out.c +++ b/src/audio_out/audio_coreaudio_out.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 * * done by Daniel Mack <xine@zonque.org> * modified by Rich Wareham <richwareham@users.sourceforge.net> diff --git a/src/audio_out/audio_directx2_out.c b/src/audio_out/audio_directx2_out.c index 7161f192d..eb4093229 100644 --- a/src/audio_out/audio_directx2_out.c +++ b/src/audio_out/audio_directx2_out.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: audio_directx2_out.c,v 1.9 2006/07/16 16:18:09 dsalt Exp $ * diff --git a/src/audio_out/audio_directx_out.c b/src/audio_out/audio_directx_out.c index d2147ac52..89fb8f7e9 100755 --- a/src/audio_out/audio_directx_out.c +++ b/src/audio_out/audio_directx_out.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 * * audio_directx_out.c, direct sound audio output plugin for xine * by Matthew Grooms <elon@altavista.com> diff --git a/src/audio_out/audio_esd_out.c b/src/audio_out/audio_esd_out.c index 20e77b75d..4e0cbfbfa 100644 --- a/src/audio_out/audio_esd_out.c +++ b/src/audio_out/audio_esd_out.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: audio_esd_out.c,v 1.35 2006/07/16 16:18:09 dsalt Exp $ */ diff --git a/src/audio_out/audio_file_out.c b/src/audio_out/audio_file_out.c index e741523b2..c59b04bde 100644 --- a/src/audio_out/audio_file_out.c +++ b/src/audio_out/audio_file_out.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: audio_file_out.c,v 1.8 2006/07/16 16:18:09 dsalt Exp $ */ diff --git a/src/audio_out/audio_fusionsound_out.c b/src/audio_out/audio_fusionsound_out.c index 71a17f6e6..92eadc6cf 100644 --- a/src/audio_out/audio_fusionsound_out.c +++ b/src/audio_out/audio_fusionsound_out.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 * * * FusionSound based audio output plugin by Claudio Ciccani <klan@directfb.org> diff --git a/src/audio_out/audio_irixal_out.c b/src/audio_out/audio_irixal_out.c index 04c338d24..4375e33ca 100644 --- a/src/audio_out/audio_irixal_out.c +++ b/src/audio_out/audio_irixal_out.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: audio_irixal_out.c,v 1.16 2006/07/16 16:18:09 dsalt Exp $ */ diff --git a/src/audio_out/audio_none_out.c b/src/audio_out/audio_none_out.c index 0f0673431..1a0c2d84b 100644 --- a/src/audio_out/audio_none_out.c +++ b/src/audio_out/audio_none_out.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: audio_none_out.c,v 1.11 2006/07/16 16:18:09 dsalt Exp $ */ diff --git a/src/audio_out/audio_oss_out.c b/src/audio_out/audio_oss_out.c index 793b47650..f5f6f8153 100644 --- a/src/audio_out/audio_oss_out.c +++ b/src/audio_out/audio_oss_out.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: audio_oss_out.c,v 1.120 2007/03/17 06:59:31 dgp85 Exp $ * diff --git a/src/audio_out/audio_pulse_out.c b/src/audio_out/audio_pulse_out.c index d93c9d279..86468a6d1 100644 --- a/src/audio_out/audio_pulse_out.c +++ b/src/audio_out/audio_pulse_out.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: audio_pulse_out.c,v 1.17 2007/04/01 00:32:29 dgp85 Exp $ * diff --git a/src/audio_out/audio_sun_out.c b/src/audio_out/audio_sun_out.c index ca91a8fe6..2c92b5fcd 100644 --- a/src/audio_out/audio_sun_out.c +++ b/src/audio_out/audio_sun_out.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: audio_sun_out.c,v 1.47 2007/03/10 00:55:14 dgp85 Exp $ */ diff --git a/src/combined/flac_decoder.c b/src/combined/flac_decoder.c index cc7c9570a..75465f6fe 100644 --- a/src/combined/flac_decoder.c +++ b/src/combined/flac_decoder.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 * * John McCutchan 2003 * FLAC Decoder (http://flac.sf.net) diff --git a/src/combined/flac_demuxer.c b/src/combined/flac_demuxer.c index b4932406e..7a5aabe0b 100644 --- a/src/combined/flac_demuxer.c +++ b/src/combined/flac_demuxer.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 * * * John McCutchan diff --git a/src/combined/nsf_decoder.c b/src/combined/nsf_decoder.c index 20472cd10..f2cf7ff8b 100644 --- a/src/combined/nsf_decoder.c +++ b/src/combined/nsf_decoder.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 * * NSF Audio "Decoder" using the Nosefart NSF engine by Matt Conte * http://www.baisoku.org/ diff --git a/src/combined/nsf_demuxer.c b/src/combined/nsf_demuxer.c index 71e4b2c78..5f2be8899 100644 --- a/src/combined/nsf_demuxer.c +++ b/src/combined/nsf_demuxer.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 */ /* diff --git a/src/combined/wavpack_combined.c b/src/combined/wavpack_combined.c index 110de2b2e..020488a90 100644 --- a/src/combined/wavpack_combined.c +++ b/src/combined/wavpack_combined.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 * * xine interface to libwavpack by Diego Pettenò <flameeyes@gmail.com> * diff --git a/src/combined/wavpack_combined.h b/src/combined/wavpack_combined.h index 7688f91df..a591d26a0 100644 --- a/src/combined/wavpack_combined.h +++ b/src/combined/wavpack_combined.h @@ -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 * * xine interface to libwavpack by Diego Pettenò <flameeyes@gmail.com> * diff --git a/src/combined/wavpack_decoder.c b/src/combined/wavpack_decoder.c index 0929d1b8e..e174bd809 100644 --- a/src/combined/wavpack_decoder.c +++ b/src/combined/wavpack_decoder.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 * * xine interface to libwavpack by Diego Pettenò <flameeyes@gmail.com> * diff --git a/src/combined/wavpack_demuxer.c b/src/combined/wavpack_demuxer.c index 5f2f57d49..597a7a6bc 100644 --- a/src/combined/wavpack_demuxer.c +++ b/src/combined/wavpack_demuxer.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 * * xine interface to libwavpack by Diego Pettenò <flameeyes@gmail.com> * diff --git a/src/combined/xine_ogg_demuxer.c b/src/combined/xine_ogg_demuxer.c index 85402484e..36971507b 100644 --- a/src/combined/xine_ogg_demuxer.c +++ b/src/combined/xine_ogg_demuxer.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 */ /* diff --git a/src/combined/xine_speex_decoder.c b/src/combined/xine_speex_decoder.c index aca048c8f..fe004faa8 100644 --- a/src/combined/xine_speex_decoder.c +++ b/src/combined/xine_speex_decoder.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: xine_decoder.c,v 1.22 2007/01/19 01:48:05 dgp85 Exp $ * diff --git a/src/combined/xine_theora_decoder.c b/src/combined/xine_theora_decoder.c index d43affead..0959a5411 100644 --- a/src/combined/xine_theora_decoder.c +++ b/src/combined/xine_theora_decoder.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: xine_decoder.c,v 1.26 2006/07/10 22:08:30 dgp85 Exp $ * @@ -123,23 +123,22 @@ static void yuv2frame(yuv_buffer *yuv, vo_frame_t *frame, int offset_x, int offs static int collect_data (theora_decoder_t *this, buf_element_t *buf ) { /* Assembles an ogg_packet which was sent with send_ogg_packet over xinebuffers */ /* this->done, this->rejected, this->op and this->decoder->flags are needed*/ - int op_size = sizeof (ogg_packet); if (buf->decoder_flags & BUF_FLAG_FRAME_START) { this->done=0; /*start from the beginnig*/ this->reject=0;/*new packet - new try*/ /*copy the ogg_packet struct and the sum, correct the adress of the packet*/ - xine_fast_memcpy (&this->op, buf->content, op_size); + xine_fast_memcpy (&this->op, buf->content, sizeof(ogg_packet)); this->op.packet=this->packet; - readin_op (this, buf->content + op_size, buf->size - op_size ); + readin_op (this, buf->content + sizeof(ogg_packet), buf->size - sizeof(ogg_packet) ); /*read the rest of the data*/ } else { if (this->done==0 || this->reject) { /*we are starting to collect an packet without the beginnig - reject the rest*/ + reject the rest*/ printf ("libtheora: rejecting packet\n"); this->reject=1; return 0; diff --git a/src/combined/xine_vorbis_decoder.c b/src/combined/xine_vorbis_decoder.c index 344bd8ed4..394f76048 100644 --- a/src/combined/xine_vorbis_decoder.c +++ b/src/combined/xine_vorbis_decoder.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: xine_decoder.c,v 1.48 2006/12/04 13:59:38 dgp85 Exp $ * diff --git a/src/demuxers/asfheader.h b/src/demuxers/asfheader.h index d52b1c0fb..8126b129b 100644 --- a/src/demuxers/asfheader.h +++ b/src/demuxers/asfheader.h @@ -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: asfheader.h,v 1.8 2006/09/12 21:24:19 valtri Exp $
*
diff --git a/src/demuxers/demux.h b/src/demuxers/demux.h index 157519a87..abd72aadd 100644 --- a/src/demuxers/demux.h +++ b/src/demuxers/demux.h @@ -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: demux.h,v 1.40 2007/01/19 00:26:39 dgp85 Exp $ */ diff --git a/src/demuxers/demux_4xm.c b/src/demuxers/demux_4xm.c index 6d599adac..4bdaa301a 100644 --- a/src/demuxers/demux_4xm.c +++ b/src/demuxers/demux_4xm.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 */ /* diff --git a/src/demuxers/demux_aac.c b/src/demuxers/demux_aac.c index 1a89cb328..ad663f052 100644 --- a/src/demuxers/demux_aac.c +++ b/src/demuxers/demux_aac.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 * * Raw AAC File Demuxer by Mike Melanson (melanson@pcisys.net) * This demuxer detects ADIF and ADTS headers in AAC files. diff --git a/src/demuxers/demux_ac3.c b/src/demuxers/demux_ac3.c index ce33ab3c8..651a8af9d 100644 --- a/src/demuxers/demux_ac3.c +++ b/src/demuxers/demux_ac3.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 */ /* diff --git a/src/demuxers/demux_aiff.c b/src/demuxers/demux_aiff.c index 2039a3958..40c8e7457 100644 --- a/src/demuxers/demux_aiff.c +++ b/src/demuxers/demux_aiff.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 */ /* diff --git a/src/demuxers/demux_asf.c b/src/demuxers/demux_asf.c index a147068f9..4b6672cb0 100644 --- a/src/demuxers/demux_asf.c +++ b/src/demuxers/demux_asf.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: demux_asf.c,v 1.194 2007/03/09 23:18:19 dgp85 Exp $ * diff --git a/src/demuxers/demux_aud.c b/src/demuxers/demux_aud.c index 23ba15df8..89ca8f061 100644 --- a/src/demuxers/demux_aud.c +++ b/src/demuxers/demux_aud.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 */ /* diff --git a/src/demuxers/demux_avi.c b/src/demuxers/demux_avi.c index 960d396f3..614c84091 100644 --- a/src/demuxers/demux_avi.c +++ b/src/demuxers/demux_avi.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 */ /* diff --git a/src/demuxers/demux_cdda.c b/src/demuxers/demux_cdda.c index d92a8ba23..b52e23ac5 100644 --- a/src/demuxers/demux_cdda.c +++ b/src/demuxers/demux_cdda.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 */ /* diff --git a/src/demuxers/demux_dts.c b/src/demuxers/demux_dts.c index 0fe758e70..078c84ea1 100644 --- a/src/demuxers/demux_dts.c +++ b/src/demuxers/demux_dts.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 * * Raw DTS Demuxer by James Stembridge (jstembridge@gmail.com) * diff --git a/src/demuxers/demux_eawve.c b/src/demuxers/demux_eawve.c index c1718d803..4076fbadc 100644 --- a/src/demuxers/demux_eawve.c +++ b/src/demuxers/demux_eawve.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 */ /* diff --git a/src/demuxers/demux_elem.c b/src/demuxers/demux_elem.c index be86b32ed..c0f34240a 100644 --- a/src/demuxers/demux_elem.c +++ b/src/demuxers/demux_elem.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 */ /* diff --git a/src/demuxers/demux_film.c b/src/demuxers/demux_film.c index e4c1c1895..6a639ae22 100644 --- a/src/demuxers/demux_film.c +++ b/src/demuxers/demux_film.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 * * FILM (CPK) File Demuxer by Mike Melanson (melanson@pcisys.net) * For more information on the FILM file format, visit: diff --git a/src/demuxers/demux_flac.c b/src/demuxers/demux_flac.c index 488a909cb..502c8772c 100644 --- a/src/demuxers/demux_flac.c +++ b/src/demuxers/demux_flac.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 */ /* diff --git a/src/demuxers/demux_fli.c b/src/demuxers/demux_fli.c index 921f08294..2a68bcfc8 100644 --- a/src/demuxers/demux_fli.c +++ b/src/demuxers/demux_fli.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 */ /* diff --git a/src/demuxers/demux_flv.c b/src/demuxers/demux_flv.c index cb811ae33..940d651e2 100644 --- a/src/demuxers/demux_flv.c +++ b/src/demuxers/demux_flv.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 */ /* diff --git a/src/demuxers/demux_idcin.c b/src/demuxers/demux_idcin.c index 5c440ad6e..8c520150c 100644 --- a/src/demuxers/demux_idcin.c +++ b/src/demuxers/demux_idcin.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 */ /* diff --git a/src/demuxers/demux_iff.c b/src/demuxers/demux_iff.c index 7323c061d..cc3a68507 100644 --- a/src/demuxers/demux_iff.c +++ b/src/demuxers/demux_iff.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 */ /* diff --git a/src/demuxers/demux_image.c b/src/demuxers/demux_image.c index 629299281..6c05ed301 100644 --- a/src/demuxers/demux_image.c +++ b/src/demuxers/demux_image.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 */ /* diff --git a/src/demuxers/demux_ipmovie.c b/src/demuxers/demux_ipmovie.c index 26392c73b..9d284ff66 100644 --- a/src/demuxers/demux_ipmovie.c +++ b/src/demuxers/demux_ipmovie.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 */ /* diff --git a/src/demuxers/demux_matroska.c b/src/demuxers/demux_matroska.c index b45db701e..9609a75e5 100644 --- a/src/demuxers/demux_matroska.c +++ b/src/demuxers/demux_matroska.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: demux_matroska.c,v 1.53 2007/03/12 16:27:21 dgp85 Exp $ * diff --git a/src/demuxers/demux_mng.c b/src/demuxers/demux_mng.c index e2ab1e4ea..373cedf80 100644 --- a/src/demuxers/demux_mng.c +++ b/src/demuxers/demux_mng.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 */ /* diff --git a/src/demuxers/demux_mod.c b/src/demuxers/demux_mod.c index 5f8361801..397a952c0 100644 --- a/src/demuxers/demux_mod.c +++ b/src/demuxers/demux_mod.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 */ /* diff --git a/src/demuxers/demux_mpc.c b/src/demuxers/demux_mpc.c index 86eb7bf3a..2718da54c 100644 --- a/src/demuxers/demux_mpc.c +++ b/src/demuxers/demux_mpc.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 * * Musepack demuxer by James Stembridge <jstembridge@gmail.com> * diff --git a/src/demuxers/demux_mpeg.c b/src/demuxers/demux_mpeg.c index 145721ce3..dfe9b7798 100644 --- a/src/demuxers/demux_mpeg.c +++ b/src/demuxers/demux_mpeg.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 */ /* diff --git a/src/demuxers/demux_mpeg_block.c b/src/demuxers/demux_mpeg_block.c index 7083d33d9..e9023b7c5 100644 --- a/src/demuxers/demux_mpeg_block.c +++ b/src/demuxers/demux_mpeg_block.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: demux_mpeg_block.c,v 1.220 2007/02/20 00:34:55 dgp85 Exp $ * diff --git a/src/demuxers/demux_mpeg_pes.c b/src/demuxers/demux_mpeg_pes.c index 705756dd6..0cab7e671 100644 --- a/src/demuxers/demux_mpeg_pes.c +++ b/src/demuxers/demux_mpeg_pes.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: demux_mpeg_pes.c,v 1.43 2007/03/29 17:11:36 dgp85 Exp $ * diff --git a/src/demuxers/demux_mpgaudio.c b/src/demuxers/demux_mpgaudio.c index ef22af16b..a45cb6367 100644 --- a/src/demuxers/demux_mpgaudio.c +++ b/src/demuxers/demux_mpgaudio.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: demux_mpgaudio.c,v 1.156 2007/03/29 16:32:12 dgp85 Exp $ * diff --git a/src/demuxers/demux_nsv.c b/src/demuxers/demux_nsv.c index 4f730a935..4abaf4058 100644 --- a/src/demuxers/demux_nsv.c +++ b/src/demuxers/demux_nsv.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 */ /* diff --git a/src/demuxers/demux_pva.c b/src/demuxers/demux_pva.c index 1b358eb1f..d15aa605f 100644 --- a/src/demuxers/demux_pva.c +++ b/src/demuxers/demux_pva.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 */ /* diff --git a/src/demuxers/demux_qt.c b/src/demuxers/demux_qt.c index dffcfac55..ec3fb6f74 100644 --- a/src/demuxers/demux_qt.c +++ b/src/demuxers/demux_qt.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 * * Quicktime File Demuxer by Mike Melanson (melanson@pcisys.net) * based on a Quicktime parsing experiment entitled 'lazyqt' diff --git a/src/demuxers/demux_rawdv.c b/src/demuxers/demux_rawdv.c index 7a4cbaec9..130f15daa 100644 --- a/src/demuxers/demux_rawdv.c +++ b/src/demuxers/demux_rawdv.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 */ /* diff --git a/src/demuxers/demux_real.c b/src/demuxers/demux_real.c index b27b01a10..957d5cc4e 100644 --- a/src/demuxers/demux_real.c +++ b/src/demuxers/demux_real.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 */ /* diff --git a/src/demuxers/demux_realaudio.c b/src/demuxers/demux_realaudio.c index 2c315519e..70329d2c6 100644 --- a/src/demuxers/demux_realaudio.c +++ b/src/demuxers/demux_realaudio.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 */ /* diff --git a/src/demuxers/demux_roq.c b/src/demuxers/demux_roq.c index 10137be7f..77e3b6ce2 100644 --- a/src/demuxers/demux_roq.c +++ b/src/demuxers/demux_roq.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 */ /* diff --git a/src/demuxers/demux_shn.c b/src/demuxers/demux_shn.c index 3db568aab..a1a88e18d 100644 --- a/src/demuxers/demux_shn.c +++ b/src/demuxers/demux_shn.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: demux_shn.c,v 1.4 2007/01/19 00:26:40 dgp85 Exp $ */ diff --git a/src/demuxers/demux_slave.c b/src/demuxers/demux_slave.c index a00ad0661..e394cf447 100644 --- a/src/demuxers/demux_slave.c +++ b/src/demuxers/demux_slave.c @@ -17,7 +17,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 */ /* diff --git a/src/demuxers/demux_smjpeg.c b/src/demuxers/demux_smjpeg.c index 8601d3cbc..d387341a8 100644 --- a/src/demuxers/demux_smjpeg.c +++ b/src/demuxers/demux_smjpeg.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 */ /* diff --git a/src/demuxers/demux_snd.c b/src/demuxers/demux_snd.c index 0f28d81cf..16fd35201 100644 --- a/src/demuxers/demux_snd.c +++ b/src/demuxers/demux_snd.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 */ /* diff --git a/src/demuxers/demux_str.c b/src/demuxers/demux_str.c index 6f3556dd4..5d4047ce0 100644 --- a/src/demuxers/demux_str.c +++ b/src/demuxers/demux_str.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 */ /* diff --git a/src/demuxers/demux_ts.c b/src/demuxers/demux_ts.c index bf557533e..d7fd24773 100644 --- a/src/demuxers/demux_ts.c +++ b/src/demuxers/demux_ts.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: demux_ts.c,v 1.129 2007/04/02 10:46:08 dgp85 Exp $ * diff --git a/src/demuxers/demux_tta.c b/src/demuxers/demux_tta.c index 4d53c5d3f..da6af0060 100644 --- a/src/demuxers/demux_tta.c +++ b/src/demuxers/demux_tta.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 * * True Audio demuxer by Diego Pettenò <flameeyes@gentoo.org> * Inspired by tta libavformat demuxer by Alex Beregszaszi diff --git a/src/demuxers/demux_vmd.c b/src/demuxers/demux_vmd.c index fd6900ec0..a1b107288 100644 --- a/src/demuxers/demux_vmd.c +++ b/src/demuxers/demux_vmd.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 */ /* diff --git a/src/demuxers/demux_voc.c b/src/demuxers/demux_voc.c index bb0cfc16d..f6b5caf7e 100644 --- a/src/demuxers/demux_voc.c +++ b/src/demuxers/demux_voc.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 */ /* diff --git a/src/demuxers/demux_vox.c b/src/demuxers/demux_vox.c index c772e4978..31b33b8c6 100644 --- a/src/demuxers/demux_vox.c +++ b/src/demuxers/demux_vox.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 */ /* diff --git a/src/demuxers/demux_vqa.c b/src/demuxers/demux_vqa.c index 987114793..16e5da46c 100644 --- a/src/demuxers/demux_vqa.c +++ b/src/demuxers/demux_vqa.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 */ /* diff --git a/src/demuxers/demux_wav.c b/src/demuxers/demux_wav.c index d7f8f9f9c..d306379e4 100644 --- a/src/demuxers/demux_wav.c +++ b/src/demuxers/demux_wav.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 */ /* diff --git a/src/demuxers/demux_wc3movie.c b/src/demuxers/demux_wc3movie.c index b02c3fa93..7cd579ba9 100644 --- a/src/demuxers/demux_wc3movie.c +++ b/src/demuxers/demux_wc3movie.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 */ /* diff --git a/src/demuxers/demux_yuv4mpeg2.c b/src/demuxers/demux_yuv4mpeg2.c index 4e0bb1069..8c080bae1 100644 --- a/src/demuxers/demux_yuv4mpeg2.c +++ b/src/demuxers/demux_yuv4mpeg2.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 */ /* diff --git a/src/demuxers/demux_yuv_frames.c b/src/demuxers/demux_yuv_frames.c index 3866f0437..ff55765c3 100644 --- a/src/demuxers/demux_yuv_frames.c +++ b/src/demuxers/demux_yuv_frames.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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ /* diff --git a/src/demuxers/ebml.c b/src/demuxers/ebml.c index 487344316..00c8e99cd 100644 --- a/src/demuxers/ebml.c +++ b/src/demuxers/ebml.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 * * EBML parser * a lot of ideas from the gstreamer parser diff --git a/src/demuxers/ebml.h b/src/demuxers/ebml.h index 9b3af4efe..194903a3d 100644 --- a/src/demuxers/ebml.h +++ b/src/demuxers/ebml.h @@ -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 * * EBML parser * a lot of ideas from the gstreamer parser diff --git a/src/demuxers/flacutils.h b/src/demuxers/flacutils.h index c95f87519..e69639925 100644 --- a/src/demuxers/flacutils.h +++ b/src/demuxers/flacutils.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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ #ifndef __FLACUTILS_H__ diff --git a/src/demuxers/group_audio.c b/src/demuxers/group_audio.c index 449c2ad12..887d9de63 100644 --- a/src/demuxers/group_audio.c +++ b/src/demuxers/group_audio.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 * * This file contains plugin entries for several demuxers used in games * diff --git a/src/demuxers/group_audio.h b/src/demuxers/group_audio.h index 984b7c88e..3431aaba2 100644 --- a/src/demuxers/group_audio.h +++ b/src/demuxers/group_audio.h @@ -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: group_audio.h,v 1.9 2006/12/26 16:59:55 dgp85 Exp $ */ diff --git a/src/demuxers/group_games.c b/src/demuxers/group_games.c index 52e39db85..3aea78fac 100644 --- a/src/demuxers/group_games.c +++ b/src/demuxers/group_games.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 * * This file contains plugin entries for several demuxers used in games * diff --git a/src/demuxers/group_games.h b/src/demuxers/group_games.h index a2e8ef254..4024f84cc 100644 --- a/src/demuxers/group_games.h +++ b/src/demuxers/group_games.h @@ -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: group_games.h,v 1.3 2004/02/13 13:48:03 tmmm Exp $ */ diff --git a/src/demuxers/id3.c b/src/demuxers/id3.c index 843b4e9e3..14090579e 100644 --- a/src/demuxers/id3.c +++ b/src/demuxers/id3.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 * * ID3 tag parser * diff --git a/src/demuxers/id3.h b/src/demuxers/id3.h index eea5930f1..e4d68f181 100644 --- a/src/demuxers/id3.h +++ b/src/demuxers/id3.h @@ -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 * * ID3 tag parser * diff --git a/src/demuxers/iff.h b/src/demuxers/iff.h index 64f44fd94..17c12bfe7 100644 --- a/src/demuxers/iff.h +++ b/src/demuxers/iff.h @@ -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 */ /* diff --git a/src/demuxers/matroska.h b/src/demuxers/matroska.h index 6950a0079..f7a7eac2b 100644 --- a/src/demuxers/matroska.h +++ b/src/demuxers/matroska.h @@ -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: matroska.h,v 1.11 2007/01/07 12:33:50 molivier Exp $ * diff --git a/src/dxr3/dxr3.h b/src/dxr3/dxr3.h index 59bb439d2..a48b5eb02 100644 --- a/src/dxr3/dxr3.h +++ b/src/dxr3/dxr3.h @@ -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: dxr3.h,v 1.8 2004/04/10 15:29:57 mroi Exp $ */ diff --git a/src/dxr3/dxr3_decode_spu.c b/src/dxr3/dxr3_decode_spu.c index f8fb5264d..a5f56cece 100644 --- a/src/dxr3/dxr3_decode_spu.c +++ b/src/dxr3/dxr3_decode_spu.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: dxr3_decode_spu.c,v 1.56 2006/07/10 22:08:13 dgp85 Exp $ */ diff --git a/src/dxr3/dxr3_decode_video.c b/src/dxr3/dxr3_decode_video.c index 675a3847a..e09f95631 100644 --- a/src/dxr3/dxr3_decode_video.c +++ b/src/dxr3/dxr3_decode_video.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: dxr3_decode_video.c,v 1.64 2006/07/10 22:08:13 dgp85 Exp $ */ diff --git a/src/dxr3/dxr3_mpeg_encoders.c b/src/dxr3/dxr3_mpeg_encoders.c index cba47aad4..2ba796bb5 100644 --- a/src/dxr3/dxr3_mpeg_encoders.c +++ b/src/dxr3/dxr3_mpeg_encoders.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: dxr3_mpeg_encoders.c,v 1.25 2007/03/10 17:25:13 dgp85 Exp $ */ diff --git a/src/dxr3/dxr3_scr.c b/src/dxr3/dxr3_scr.c index 8d4c3b5cc..cdd6fb4d2 100644 --- a/src/dxr3/dxr3_scr.c +++ b/src/dxr3/dxr3_scr.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: dxr3_scr.c,v 1.19 2004/08/16 15:52:24 mroi Exp $ */ diff --git a/src/dxr3/dxr3_scr.h b/src/dxr3/dxr3_scr.h index fe4f1ccbe..53315be43 100644 --- a/src/dxr3/dxr3_scr.h +++ b/src/dxr3/dxr3_scr.h @@ -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: dxr3_scr.h,v 1.7 2004/01/04 22:26:29 mroi Exp $ */ diff --git a/src/dxr3/dxr3_spu_encoder.c b/src/dxr3/dxr3_spu_encoder.c index 75ad12495..10ef56af1 100644 --- a/src/dxr3/dxr3_spu_encoder.c +++ b/src/dxr3/dxr3_spu_encoder.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: dxr3_spu_encoder.c,v 1.9 2005/09/24 19:08:26 miguelfreitas Exp $ */ diff --git a/src/dxr3/video_out_dxr3.c b/src/dxr3/video_out_dxr3.c index 71f66030a..58258bebe 100644 --- a/src/dxr3/video_out_dxr3.c +++ b/src/dxr3/video_out_dxr3.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: video_out_dxr3.c,v 1.117 2006/07/17 17:19:51 dsalt Exp $ */ diff --git a/src/dxr3/video_out_dxr3.h b/src/dxr3/video_out_dxr3.h index 8a5e9a8e6..2eb5619ce 100644 --- a/src/dxr3/video_out_dxr3.h +++ b/src/dxr3/video_out_dxr3.h @@ -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: video_out_dxr3.h,v 1.25 2005/09/25 00:44:04 miguelfreitas Exp $ */ diff --git a/src/input/base64.c b/src/input/base64.c index 0eccbe84e..2d553d498 100644 --- a/src/input/base64.c +++ b/src/input/base64.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 * * Base64 encoding modified for Musicbrainz * relicensed under the GNU General Public License for use in xine-lib @@ -39,7 +39,7 @@ You should have received a copy of the GNU Lesser General Public License along with this library; 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: base64.c,v 1.2 2004/05/05 18:44:19 mroi Exp $ diff --git a/src/input/base64.h b/src/input/base64.h index 72feef885..9c6ba63b6 100644 --- a/src/input/base64.h +++ b/src/input/base64.h @@ -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 * * Base64 encoding modified for Musicbrainz * relicensed under the GNU General Public License for use in xine-lib @@ -39,7 +39,7 @@ You should have received a copy of the GNU Lesser General Public License along with this library; 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: base64.h,v 1.1 2004/05/05 09:11:39 hadess Exp $ diff --git a/src/input/http_helper.c b/src/input/http_helper.c index 4bcb734e2..dcd57ebee 100644 --- a/src/input/http_helper.c +++ b/src/input/http_helper.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 * * URL helper functions * diff --git a/src/input/http_helper.h b/src/input/http_helper.h index 546a55803..d3ac0ea95 100644 --- a/src/input/http_helper.h +++ b/src/input/http_helper.h @@ -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 * * URL helper functions * diff --git a/src/input/input_cdda.c b/src/input/input_cdda.c index 029658fe1..8a5a099d0 100644 --- a/src/input/input_cdda.c +++ b/src/input/input_cdda.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 * * Compact Disc Digital Audio (CDDA) Input Plugin * by Mike Melanson (melanson@pcisys.net) diff --git a/src/input/input_dvb.c b/src/input/input_dvb.c index 5b307fc1e..1715c5a2f 100644 --- a/src/input/input_dvb.c +++ b/src/input/input_dvb.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 * * * Input plugin for Digital TV (Digital Video Broadcast - DVB) devices, diff --git a/src/input/input_dvd.c b/src/input/input_dvd.c index 83ec751a4..37c07c218 100644 --- a/src/input/input_dvd.c +++ b/src/input/input_dvd.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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * $Id: input_dvd.c,v 1.216 2007/02/20 01:04:07 dgp85 Exp $ * diff --git a/src/input/input_file.c b/src/input/input_file.c index 91513194c..6e443063c 100644 --- a/src/input/input_file.c +++ b/src/input/input_file.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: input_file.c,v 1.122 2007/03/29 19:47:17 dgp85 Exp $ */ diff --git a/src/input/input_gnome_vfs.c b/src/input/input_gnome_vfs.c index 1fe29fbcd..866cc128c 100644 --- a/src/input/input_gnome_vfs.c +++ b/src/input/input_gnome_vfs.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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * $Id: input_gnome_vfs.c,v 1.34 2007/01/19 01:05:25 dgp85 Exp $ */ diff --git a/src/input/input_http.c b/src/input/input_http.c index 8c0c11ee7..25153e5dc 100644 --- a/src/input/input_http.c +++ b/src/input/input_http.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 * * input plugin for http network streams * diff --git a/src/input/input_mms.c b/src/input/input_mms.c index 23102ac18..4fabb766e 100644 --- a/src/input/input_mms.c +++ b/src/input/input_mms.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: input_mms.c,v 1.70 2007/02/20 00:51:39 dgp85 Exp $ * diff --git a/src/input/input_net.c b/src/input/input_net.c index dd318c37c..2a7b3e267 100644 --- a/src/input/input_net.c +++ b/src/input/input_net.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 * * Read from a tcp network stream over a lan (put a tweaked mp1e encoder the * other end and you can watch tv anywhere in the house ..) diff --git a/src/input/input_plugin.h b/src/input/input_plugin.h index 66b3abbb9..55bc14ed4 100644 --- a/src/input/input_plugin.h +++ b/src/input/input_plugin.h @@ -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: input_plugin.h,v 1.64 2007/01/19 01:05:25 dgp85 Exp $ */ diff --git a/src/input/input_pnm.c b/src/input/input_pnm.c index 29d65da2d..b49060faa 100644 --- a/src/input/input_pnm.c +++ b/src/input/input_pnm.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 * * pnm input plugin by joschka */ diff --git a/src/input/input_pvr.c b/src/input/input_pvr.c index 48b69c8f5..1cd5a8d9e 100644 --- a/src/input/input_pvr.c +++ b/src/input/input_pvr.c @@ -17,7 +17,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 * * pvr input plugin for WinTV-PVR 250/350 pci cards using driver from: * http://ivtv.sf.net diff --git a/src/input/input_rtp.c b/src/input/input_rtp.c index b49206c5e..1a57b7a6d 100644 --- a/src/input/input_rtp.c +++ b/src/input/input_rtp.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 * * Xine input plugin for multicast video streams. * diff --git a/src/input/input_rtsp.c b/src/input/input_rtsp.c index cd2209baa..318659b88 100644 --- a/src/input/input_rtsp.c +++ b/src/input/input_rtsp.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 * * rtsp input plugin */ diff --git a/src/input/input_smb.c b/src/input/input_smb.c index 87f2a81fa..0fd2c6f18 100644 --- a/src/input/input_smb.c +++ b/src/input/input_smb.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: input_smb.c,v 1.16 2007/01/26 17:06:05 dgp85 Exp $ */ diff --git a/src/input/input_stdin_fifo.c b/src/input/input_stdin_fifo.c index 2b3cf1376..64672fce3 100644 --- a/src/input/input_stdin_fifo.c +++ b/src/input/input_stdin_fifo.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: input_stdin_fifo.c,v 1.70 2007/02/20 00:34:56 dgp85 Exp $ */ diff --git a/src/input/input_v4l.c b/src/input/input_v4l.c index 5acf8099b..b9ac7296a 100644 --- a/src/input/input_v4l.c +++ b/src/input/input_v4l.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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * v4l input plugin */ diff --git a/src/input/input_vcd.c b/src/input/input_vcd.c index 7d2ea0063..7ec4b1ea8 100644 --- a/src/input/input_vcd.c +++ b/src/input/input_vcd.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: input_vcd.c,v 1.89 2007/03/16 16:32:58 dgp85 Exp $ * diff --git a/src/input/libreal/asmrp.c b/src/input/libreal/asmrp.c index 8afc19df6..9bdc2536b 100644 --- a/src/input/libreal/asmrp.c +++ b/src/input/libreal/asmrp.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: asmrp.c,v 1.10 2006/12/25 15:39:31 dgp85 Exp $ * diff --git a/src/input/libreal/asmrp.h b/src/input/libreal/asmrp.h index d787eb330..18dd0a314 100644 --- a/src/input/libreal/asmrp.h +++ b/src/input/libreal/asmrp.h @@ -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: asmrp.h,v 1.3 2006/11/29 19:43:01 dgp85 Exp $ * diff --git a/src/input/libreal/real.c b/src/input/libreal/real.c index 93dfc7047..ef2d266e8 100644 --- a/src/input/libreal/real.c +++ b/src/input/libreal/real.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: real.c,v 1.26 2007/01/19 01:19:06 dgp85 Exp $ * diff --git a/src/input/libreal/real.h b/src/input/libreal/real.h index ef9778dbc..bc6078379 100644 --- a/src/input/libreal/real.h +++ b/src/input/libreal/real.h @@ -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: real.h,v 1.5 2004/04/24 16:55:42 miguelfreitas Exp $ * diff --git a/src/input/libreal/rmff.c b/src/input/libreal/rmff.c index 2fec05972..6a9854f61 100644 --- a/src/input/libreal/rmff.c +++ b/src/input/libreal/rmff.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: rmff.c,v 1.8 2006/06/20 01:07:58 dgp85 Exp $ * diff --git a/src/input/libreal/rmff.h b/src/input/libreal/rmff.h index 4f33d93a5..29c519a13 100644 --- a/src/input/libreal/rmff.h +++ b/src/input/libreal/rmff.h @@ -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: rmff.h,v 1.5 2004/04/06 19:20:16 valtri Exp $ * diff --git a/src/input/libreal/sdpplin.c b/src/input/libreal/sdpplin.c index 019237243..30977223e 100644 --- a/src/input/libreal/sdpplin.c +++ b/src/input/libreal/sdpplin.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: sdpplin.c,v 1.8 2006/12/25 16:21:56 dgp85 Exp $ * diff --git a/src/input/libreal/sdpplin.h b/src/input/libreal/sdpplin.h index ae03cf0cf..e6994642b 100644 --- a/src/input/libreal/sdpplin.h +++ b/src/input/libreal/sdpplin.h @@ -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: sdpplin.h,v 1.2 2003/12/09 00:02:30 f1rmb Exp $ * diff --git a/src/input/librtsp/rtsp.c b/src/input/librtsp/rtsp.c index ffe181547..1819dd6e7 100644 --- a/src/input/librtsp/rtsp.c +++ b/src/input/librtsp/rtsp.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: rtsp.c,v 1.21 2006/06/20 01:07:58 dgp85 Exp $ * diff --git a/src/input/librtsp/rtsp.h b/src/input/librtsp/rtsp.h index 469def93d..e4340ee9a 100644 --- a/src/input/librtsp/rtsp.h +++ b/src/input/librtsp/rtsp.h @@ -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: rtsp.h,v 1.4 2003/12/09 00:02:31 f1rmb Exp $ * diff --git a/src/input/librtsp/rtsp_session.c b/src/input/librtsp/rtsp_session.c index 66de10584..70ee18a62 100644 --- a/src/input/librtsp/rtsp_session.c +++ b/src/input/librtsp/rtsp_session.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: rtsp_session.c,v 1.19 2006/12/22 18:08:10 klan Exp $ * diff --git a/src/input/librtsp/rtsp_session.h b/src/input/librtsp/rtsp_session.h index 649842e7a..e00206f3e 100644 --- a/src/input/librtsp/rtsp_session.h +++ b/src/input/librtsp/rtsp_session.h @@ -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: rtsp_session.h,v 1.7 2006/12/18 21:31:47 klan Exp $ * diff --git a/src/input/media_helper.c b/src/input/media_helper.c index da30783b0..d2b1772a4 100644 --- a/src/input/media_helper.c +++ b/src/input/media_helper.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 * */ diff --git a/src/input/media_helper.h b/src/input/media_helper.h index 3d2773428..7e6303dfd 100644 --- a/src/input/media_helper.h +++ b/src/input/media_helper.h @@ -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 * */ diff --git a/src/input/mms.c b/src/input/mms.c index db7007e49..89da1d9b5 100644 --- a/src/input/mms.c +++ b/src/input/mms.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: mms.c,v 1.65 2007/02/20 00:34:56 dgp85 Exp $ * diff --git a/src/input/mms.h b/src/input/mms.h index 310a6d0cc..2df16fcdc 100644 --- a/src/input/mms.h +++ b/src/input/mms.h @@ -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: mms.h,v 1.13 2007/01/03 15:09:42 klan Exp $ * diff --git a/src/input/mmsh.c b/src/input/mmsh.c index df8d0441f..70db4adee 100644 --- a/src/input/mmsh.c +++ b/src/input/mmsh.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: mmsh.c,v 1.42 2007/01/11 16:20:55 klan Exp $ * diff --git a/src/input/mmsh.h b/src/input/mmsh.h index 1ded6295a..403115bd1 100644 --- a/src/input/mmsh.h +++ b/src/input/mmsh.h @@ -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: mmsh.h,v 1.6 2007/01/09 20:51:00 klan Exp $ * diff --git a/src/input/net_buf_ctrl.c b/src/input/net_buf_ctrl.c index 86514cdea..624af4081 100644 --- a/src/input/net_buf_ctrl.c +++ b/src/input/net_buf_ctrl.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 * * network buffering control */ diff --git a/src/input/net_buf_ctrl.h b/src/input/net_buf_ctrl.h index c3ef554fb..79f698008 100644 --- a/src/input/net_buf_ctrl.h +++ b/src/input/net_buf_ctrl.h @@ -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 * * network buffering control */ diff --git a/src/input/pnm.c b/src/input/pnm.c index cba0aff1f..c97dca75b 100644 --- a/src/input/pnm.c +++ b/src/input/pnm.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: pnm.c,v 1.22 2006/06/20 01:46:41 dgp85 Exp $ * diff --git a/src/input/pnm.h b/src/input/pnm.h index 2970ed711..94574e2fb 100644 --- a/src/input/pnm.h +++ b/src/input/pnm.h @@ -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: pnm.h,v 1.5 2003/12/09 00:02:30 f1rmb Exp $ * diff --git a/src/input/vcd/vcdio.c b/src/input/vcd/vcdio.c index 387397cf4..b3194e281 100644 --- a/src/input/vcd/vcdio.c +++ b/src/input/vcd/vcdio.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 */ diff --git a/src/input/vcd/vcdio.h b/src/input/vcd/vcdio.h index bd9daf3b6..145bb4d7f 100644 --- a/src/input/vcd/vcdio.h +++ b/src/input/vcd/vcdio.h @@ -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 */ diff --git a/src/input/vcd/vcdplayer.c b/src/input/vcd/vcdplayer.c index 502d736cc..7f9189cba 100644 --- a/src/input/vcd/vcdplayer.c +++ b/src/input/vcd/vcdplayer.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 */ diff --git a/src/input/vcd/vcdplayer.h b/src/input/vcd/vcdplayer.h index 9a9ed7a1b..868ca32e4 100644 --- a/src/input/vcd/vcdplayer.h +++ b/src/input/vcd/vcdplayer.h @@ -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 */ diff --git a/src/input/vcd/xine-extra.c b/src/input/vcd/xine-extra.c index 90c729181..b0423a913 100644 --- a/src/input/vcd/xine-extra.c +++ b/src/input/vcd/xine-extra.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 These are routines that probably should be in xine, but for whatever reason aren't - yet. diff --git a/src/input/vcd/xine-extra.h b/src/input/vcd/xine-extra.h index 2f8b12a71..f4051cf52 100644 --- a/src/input/vcd/xine-extra.h +++ b/src/input/vcd/xine-extra.h @@ -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 These are routines that probably should be in xine, but for whatever reason aren't - yet. diff --git a/src/input/vcd/xineplug_inp_vcd.c b/src/input/vcd/xineplug_inp_vcd.c index e41eb33d9..ecd0b020a 100644 --- a/src/input/vcd/xineplug_inp_vcd.c +++ b/src/input/vcd/xineplug_inp_vcd.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 */ /* diff --git a/src/libffmpeg/ff_audio_decoder.c b/src/libffmpeg/ff_audio_decoder.c index 4a4141b2f..e125e6e39 100644 --- a/src/libffmpeg/ff_audio_decoder.c +++ b/src/libffmpeg/ff_audio_decoder.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: audio_decoder.c,v 1.33 2007/01/28 18:38:33 miguelfreitas Exp $ * diff --git a/src/libffmpeg/ff_dvaudio_decoder.c b/src/libffmpeg/ff_dvaudio_decoder.c index 7a20953e7..85f4a4842 100644 --- a/src/libffmpeg/ff_dvaudio_decoder.c +++ b/src/libffmpeg/ff_dvaudio_decoder.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: dvaudio_decoder.c,v 1.11 2006/07/10 22:08:29 dgp85 Exp $ * diff --git a/src/libffmpeg/ff_mpeg_parser.c b/src/libffmpeg/ff_mpeg_parser.c index fcee29a80..795dee646 100644 --- a/src/libffmpeg/ff_mpeg_parser.c +++ b/src/libffmpeg/ff_mpeg_parser.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 * * Simple MPEG-ES parser/framer by Thibaut Mattern (tmattern@noos.fr) * based on libmpeg2 decoder. diff --git a/src/libffmpeg/ff_mpeg_parser.h b/src/libffmpeg/ff_mpeg_parser.h index b307714cc..8644b2379 100644 --- a/src/libffmpeg/ff_mpeg_parser.h +++ b/src/libffmpeg/ff_mpeg_parser.h @@ -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 * * Simple MPEG-ES parser/framer by Thibaut Mattern (tmattern@noos.fr) * based on libmpeg2 decoder. diff --git a/src/libffmpeg/ff_video_decoder.c b/src/libffmpeg/ff_video_decoder.c index 69a0feec1..e823b392c 100644 --- a/src/libffmpeg/ff_video_decoder.c +++ b/src/libffmpeg/ff_video_decoder.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: video_decoder.c,v 1.73 2007/03/29 18:41:02 dgp85 Exp $ * diff --git a/src/libffmpeg/ffmpeg_decoder.c b/src/libffmpeg/ffmpeg_decoder.c index 9f1db0c6d..86cae1c32 100644 --- a/src/libffmpeg/ffmpeg_decoder.c +++ b/src/libffmpeg/ffmpeg_decoder.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: xine_decoder.c,v 1.173 2007/01/13 21:19:52 miguelfreitas Exp $ * diff --git a/src/libffmpeg/ffmpeg_decoder.h b/src/libffmpeg/ffmpeg_decoder.h index f005f09e5..bc3ff3e9e 100644 --- a/src/libffmpeg/ffmpeg_decoder.h +++ b/src/libffmpeg/ffmpeg_decoder.h @@ -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: xine_decoder.h,v 1.7.2.1 2006/12/02 01:20:07 dgp85 Exp $ * diff --git a/src/libffmpeg/ffmpeg_encoder.c b/src/libffmpeg/ffmpeg_encoder.c index 8db721002..9e9800c1d 100644 --- a/src/libffmpeg/ffmpeg_encoder.c +++ b/src/libffmpeg/ffmpeg_encoder.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: xine_encoder.c,v 1.25 2006/07/10 22:08:29 dgp85 Exp $ */ diff --git a/src/libmpeg2/xine_mpeg2_decoder.c b/src/libmpeg2/xine_mpeg2_decoder.c index d26b5b24d..8989e48f6 100644 --- a/src/libmpeg2/xine_mpeg2_decoder.c +++ b/src/libmpeg2/xine_mpeg2_decoder.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: xine_decoder.c,v 1.59 2006/07/10 22:08:29 dgp85 Exp $ * diff --git a/src/libreal/real_common.c b/src/libreal/real_common.c index 371ffd246..88036f169 100644 --- a/src/libreal/real_common.c +++ b/src/libreal/real_common.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: real_common.c,v 1.12 2007/03/17 15:45:41 dgp85 Exp $ * @@ -75,32 +75,63 @@ void _x_real_codecs_init(xine_t *const xine) { #ifdef REAL_CODEC_PATH const char *const default_real_codecs_path = REAL_CODEC_PATH; #else - const char *default_real_codecs_path = ""; - struct stat s; - -#define try_real_path(path) \ - if (!stat (path "/drvc.so", &s)) \ - default_real_codecs_path = path; -#define try_real_subpath(path) \ - try_real_path("/usr/" path) \ - else try_real_path("/usr/local/" path) \ - else try_real_path("/opt/" path) - - /* The priority is for the first found */ - try_real_subpath("lib/win32") - else try_real_subpath("lib/codecs") - else try_real_subpath("lib64/real") - else try_real_subpath("lib/real") - else try_real_subpath("lib/RealPlayer10GOLD/codecs") - else try_real_subpath("lib64/RealPlayer10/codecs") - else try_real_subpath("lib/RealPlayer10/codecs") - else try_real_subpath("lib64/RealPlayer9/users/Real/Codecs") - else try_real_subpath("lib/RealPlayer9/users/Real/Codecs") - else try_real_subpath("lib/RealPlayer8/Codecs") - else try_real_subpath("RealPlayer8/Codecs"); - -#undef try_real_path -#undef try_real_subpath + char default_real_codecs_path[256]; + + default_real_codecs_path[0] = 0; + +#define UL64 0x05 /* /usr/{,local/}lib64 */ +#define UL 0x0A /* /usr/{,local/}lib */ +#define O 0x10 /* /opt */ +#define OL64 0x20 /* /opt/lib64 */ +#define OL 0x40 /* /opt/lib */ + + static const char *const prefix[] = { + "/usr/lib64", "/usr/local/lib64", + "/usr/lib", "/usr/local/lib", + "/opt", "/opt/lib64", "/opt/lib", + }; + + static const struct { + int prefix; + const char *path; + } paths[] = { + { O | UL, "win32" }, + { O | UL, "codecs" }, + { O | UL | UL64, "real" }, + { O, "real/RealPlayer/codecs" }, + { OL | OL64 | UL | UL64, "RealPlayer10GOLD/codecs" }, + { OL | OL64 | UL | UL64, "RealPlayer10/codecs" }, + { OL | OL64 | UL | UL64, "RealPlayer9/users/Real/Codecs" }, + { O | OL | UL, "RealPlayer8/Codecs" }, + {} + }; + + int i; + for (i = 0; paths[i].prefix; ++i) + { + int p; + for (p = 0; p < sizeof (prefix) / sizeof (prefix[0]); ++p) + { + if (paths[i].prefix & (1 << p)) + { + void *handle; + snprintf (default_real_codecs_path, sizeof (default_real_codecs_path), "%s/%s/drvc.so", prefix[p], paths[i].path); + handle = dlopen (default_real_codecs_path, RTLD_NOW); + if (handle) + { + dlclose (handle); + snprintf (default_real_codecs_path, sizeof (default_real_codecs_path), "%s/%s", prefix[p], paths[i].path); + goto found; + } + } + } + } + + /* if this is reached, no valid path was found */ + default_real_codecs_path[0] = 0; + + found:; + #endif real_codecs_path = diff --git a/src/libreal/real_common.h b/src/libreal/real_common.h index 232bf2a4d..62758d435 100644 --- a/src/libreal/real_common.h +++ b/src/libreal/real_common.h @@ -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: real_common.h,v 1.7 2007/03/17 15:45:41 dgp85 Exp $ * diff --git a/src/libreal/xine_real_audio_decoder.c b/src/libreal/xine_real_audio_decoder.c index 24fc5a949..69bb596e4 100644 --- a/src/libreal/xine_real_audio_decoder.c +++ b/src/libreal/xine_real_audio_decoder.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: audio_decoder.c,v 1.59 2007/03/17 15:45:41 dgp85 Exp $ * diff --git a/src/libreal/xine_real_video_decoder.c b/src/libreal/xine_real_video_decoder.c index 48fbc6271..2af79bb95 100644 --- a/src/libreal/xine_real_video_decoder.c +++ b/src/libreal/xine_real_video_decoder.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: xine_decoder.c,v 1.93 2007/03/17 15:45:41 dgp85 Exp $ * diff --git a/src/libspucc/cc_decoder.c b/src/libspucc/cc_decoder.c index dc380c8de..1e7ab03b4 100644 --- a/src/libspucc/cc_decoder.c +++ b/src/libspucc/cc_decoder.c @@ -18,7 +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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * $Id: cc_decoder.c,v 1.28 2007/02/20 00:56:36 dgp85 Exp $ * diff --git a/src/libspucc/cc_decoder.h b/src/libspucc/cc_decoder.h index 0e7fb69a5..5c1c68152 100644 --- a/src/libspucc/cc_decoder.h +++ b/src/libspucc/cc_decoder.h @@ -18,7 +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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * $Id: cc_decoder.h,v 1.8 2007/02/20 00:56:36 dgp85 Exp $ * diff --git a/src/libspucc/xine_cc_decoder.c b/src/libspucc/xine_cc_decoder.c index 1a32274f6..7d592ef34 100644 --- a/src/libspucc/xine_cc_decoder.c +++ b/src/libspucc/xine_cc_decoder.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: xine_decoder.c,v 1.34 2006/07/10 22:08:30 dgp85 Exp $ * diff --git a/src/libspucmml/xine_cmml_decoder.c b/src/libspucmml/xine_cmml_decoder.c index 13cb6c066..63982e71d 100644 --- a/src/libspucmml/xine_cmml_decoder.c +++ b/src/libspucmml/xine_cmml_decoder.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: xine_decoder.c,v 1.8 2006/07/10 22:08:30 dgp85 Exp $ * diff --git a/src/libspudec/spu.h b/src/libspudec/spu.h index 91f4f8ab6..7e9aed3e8 100644 --- a/src/libspudec/spu.h +++ b/src/libspudec/spu.h @@ -17,7 +17,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: spu.h,v 1.27 2004/07/14 01:18:48 miguelfreitas Exp $ * diff --git a/src/libspudec/xine_spu_decoder.c b/src/libspudec/xine_spu_decoder.c index c98d9e4dd..177fff6f3 100644 --- a/src/libspudec/xine_spu_decoder.c +++ b/src/libspudec/xine_spu_decoder.c @@ -17,7 +17,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: xine_decoder.c,v 1.116 2006/07/10 22:08:30 dgp85 Exp $ * diff --git a/src/libspudvb/xine_spudvb_decoder.c b/src/libspudvb/xine_spudvb_decoder.c index f5bb49b33..b5abbcecc 100644 --- a/src/libspudvb/xine_spudvb_decoder.c +++ b/src/libspudvb/xine_spudvb_decoder.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: xine_decoder.c,v 1.20 2006/07/10 22:08:30 dgp85 Exp $ * diff --git a/src/libsputext/demux_sputext.c b/src/libsputext/demux_sputext.c index c17dde6c8..14c6f2b42 100644 --- a/src/libsputext/demux_sputext.c +++ b/src/libsputext/demux_sputext.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: demux_sputext.c,v 1.53 2007/01/19 01:05:25 dgp85 Exp $ * diff --git a/src/libsputext/xine_sputext_decoder.c b/src/libsputext/xine_sputext_decoder.c index 66ce4a533..a6714c411 100644 --- a/src/libsputext/xine_sputext_decoder.c +++ b/src/libsputext/xine_sputext_decoder.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: xine_decoder.c,v 1.99 2007/02/20 01:04:07 dgp85 Exp $ * diff --git a/src/libw32dll/qt_decoder.c b/src/libw32dll/qt_decoder.c index da2883f0f..57ddf79d7 100644 --- a/src/libw32dll/qt_decoder.c +++ b/src/libw32dll/qt_decoder.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: qt_decoder.c,v 1.45 2006/07/10 22:08:43 dgp85 Exp $ * diff --git a/src/libw32dll/w32codec.c b/src/libw32dll/w32codec.c index 02cad2d1f..29a4f24eb 100644 --- a/src/libw32dll/w32codec.c +++ b/src/libw32dll/w32codec.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: w32codec.c,v 1.155 2006/07/10 22:08:43 dgp85 Exp $ * diff --git a/src/libw32dll/w32codec.h b/src/libw32dll/w32codec.h index 609ed7c90..552819ae1 100644 --- a/src/libw32dll/w32codec.h +++ b/src/libw32dll/w32codec.h @@ -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: w32codec.h,v 1.3 2001/06/10 00:21:53 guenter Exp $ * diff --git a/src/libxineadec/fooaudio.c b/src/libxineadec/fooaudio.c index 33beb3104..2174f1799 100644 --- a/src/libxineadec/fooaudio.c +++ b/src/libxineadec/fooaudio.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 * * fooaudio.c: This is a reference audio decoder for the xine multimedia * player. It really works too! It will output a continuous sine wave in diff --git a/src/libxineadec/gsm610.c b/src/libxineadec/gsm610.c index d26dc54ad..f54c56924 100644 --- a/src/libxineadec/gsm610.c +++ b/src/libxineadec/gsm610.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 * * GSM 6.10 Audio Decoder * This decoder is based on the GSM 6.10 codec library found at: diff --git a/src/libxineadec/xine_a52_decoder.c b/src/libxineadec/xine_a52_decoder.c index 2a9214f75..35e34eb57 100644 --- a/src/libxineadec/xine_a52_decoder.c +++ b/src/libxineadec/xine_a52_decoder.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: xine_decoder.c,v 1.81 2007/02/20 00:34:57 dgp85 Exp $ * diff --git a/src/libxineadec/xine_dts_decoder.c b/src/libxineadec/xine_dts_decoder.c index b7b55c85c..f62aa1b94 100644 --- a/src/libxineadec/xine_dts_decoder.c +++ b/src/libxineadec/xine_dts_decoder.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 */ /** diff --git a/src/libxineadec/xine_faad_decoder.c b/src/libxineadec/xine_faad_decoder.c index 2892dbe75..f9a16541d 100644 --- a/src/libxineadec/xine_faad_decoder.c +++ b/src/libxineadec/xine_faad_decoder.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: xine_decoder.c,v 1.49 2007/02/20 00:34:57 dgp85 Exp $ * diff --git a/src/libxineadec/xine_lpcm_decoder.c b/src/libxineadec/xine_lpcm_decoder.c index ef50d9c51..66cdcf637 100644 --- a/src/libxineadec/xine_lpcm_decoder.c +++ b/src/libxineadec/xine_lpcm_decoder.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 */ /** diff --git a/src/libxineadec/xine_musepack_decoder.c b/src/libxineadec/xine_musepack_decoder.c index d68583a5b..7e6b93f45 100644 --- a/src/libxineadec/xine_musepack_decoder.c +++ b/src/libxineadec/xine_musepack_decoder.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 */ /** diff --git a/src/libxinevdec/bitplane.c b/src/libxinevdec/bitplane.c index 5812a16ea..6e982d671 100644 --- a/src/libxinevdec/bitplane.c +++ b/src/libxinevdec/bitplane.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 * * Bitplane "Decoder" by Manfred Tremmel (Manfred.Tremmel@iiv.de) * Converts Amiga typical bitplane pictures to a YUV2 map diff --git a/src/libxinevdec/foovideo.c b/src/libxinevdec/foovideo.c index 385784d5d..4af8b7c73 100644 --- a/src/libxinevdec/foovideo.c +++ b/src/libxinevdec/foovideo.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 * * foovideo.c: This is a reference video decoder for the xine multimedia * player. It really works too! It will output frames of packed YUY2 data diff --git a/src/libxinevdec/gdkpixbuf.c b/src/libxinevdec/gdkpixbuf.c index f5c2973fd..837ca1fbd 100644 --- a/src/libxinevdec/gdkpixbuf.c +++ b/src/libxinevdec/gdkpixbuf.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: gdkpixbuf.c,v 1.7 2006/08/05 13:31:13 hadess Exp $ * diff --git a/src/libxinevdec/image.c b/src/libxinevdec/image.c index 4f33e91e6..42417c726 100644 --- a/src/libxinevdec/image.c +++ b/src/libxinevdec/image.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: image.c,v 1.21 2006/10/16 22:18:24 valtri Exp $ * diff --git a/src/libxinevdec/rgb.c b/src/libxinevdec/rgb.c index aef58be97..fd6e2739c 100644 --- a/src/libxinevdec/rgb.c +++ b/src/libxinevdec/rgb.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 * * Raw RGB "Decoder" by Mike Melanson (melanson@pcisys.net) * Actually, this decoder just converts a raw RGB image to a YUY2 map diff --git a/src/libxinevdec/yuv.c b/src/libxinevdec/yuv.c index 8314765d9..3a4814bdc 100644 --- a/src/libxinevdec/yuv.c +++ b/src/libxinevdec/yuv.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 * * YUV "Decoder" by Mike Melanson (melanson@pcisys.net) * Actually, this decoder just reorganizes chunks of raw YUV data in such diff --git a/src/post/audio/audio_filters.c b/src/post/audio/audio_filters.c index 3d56a793b..68c48a479 100644 --- a/src/post/audio/audio_filters.c +++ b/src/post/audio/audio_filters.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: audio_filters.c,v 1.7 2006/07/10 22:08:44 dgp85 Exp $ * diff --git a/src/post/audio/audio_filters.h b/src/post/audio/audio_filters.h index 111367006..ced5e27b7 100644 --- a/src/post/audio/audio_filters.h +++ b/src/post/audio/audio_filters.h @@ -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: audio_filters.h,v 1.3 2006/02/05 20:38:37 miguelfreitas Exp $ * diff --git a/src/post/audio/stretch.c b/src/post/audio/stretch.c index 33fd4b7ce..d8b174b4f 100644 --- a/src/post/audio/stretch.c +++ b/src/post/audio/stretch.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 * * Time stretch by a given factor, optionally preserving pitch * diff --git a/src/post/audio/upmix.c b/src/post/audio/upmix.c index bc8cb8025..fe8c4a762 100644 --- a/src/post/audio/upmix.c +++ b/src/post/audio/upmix.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 * * Upmix audio filter for xine. * (c) 2004 James Courtier-Dutton (James@superbug.demon.co.uk) diff --git a/src/post/audio/upmix_mono.c b/src/post/audio/upmix_mono.c index 5a8ea9abb..c6f53acb2 100644 --- a/src/post/audio/upmix_mono.c +++ b/src/post/audio/upmix_mono.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 * * Upmix audio filter for xine. * (c) 2004 James Courtier-Dutton (James@superbug.demon.co.uk) diff --git a/src/post/audio/volnorm.c b/src/post/audio/volnorm.c index 9278db6a9..866dd87ae 100644 --- a/src/post/audio/volnorm.c +++ b/src/post/audio/volnorm.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 * * Volume normalization audio filter for xine. Ported by Jason Tackaberry * from MPlayer's af_volnorm, which is copyright 2004 by Alex Beregszaszi diff --git a/src/post/deinterlace/deinterlace.c b/src/post/deinterlace/deinterlace.c index 7928c1a64..8e4a3bb00 100644 --- a/src/post/deinterlace/deinterlace.c +++ b/src/post/deinterlace/deinterlace.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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA. */ #ifdef HAVE_CONFIG_H diff --git a/src/post/deinterlace/deinterlace.h b/src/post/deinterlace/deinterlace.h index 0e4ab49b5..e3e614834 100644 --- a/src/post/deinterlace/deinterlace.h +++ b/src/post/deinterlace/deinterlace.h @@ -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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA. */ #ifndef DEINTERLACE_H_INCLUDED diff --git a/src/post/deinterlace/plugins/double.c b/src/post/deinterlace/plugins/double.c index 5cc13f5e9..35c5417a3 100644 --- a/src/post/deinterlace/plugins/double.c +++ b/src/post/deinterlace/plugins/double.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. + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA. */ #ifdef HAVE_CONFIG_H diff --git a/src/post/deinterlace/plugins/greedy2frame.c b/src/post/deinterlace/plugins/greedy2frame.c index b2f929c8a..57e3228ac 100644 --- a/src/post/deinterlace/plugins/greedy2frame.c +++ b/src/post/deinterlace/plugins/greedy2frame.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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA. */ #ifdef HAVE_CONFIG_H diff --git a/src/post/deinterlace/plugins/plugins.h b/src/post/deinterlace/plugins/plugins.h index b42c0cbc8..949e0e4d1 100644 --- a/src/post/deinterlace/plugins/plugins.h +++ b/src/post/deinterlace/plugins/plugins.h @@ -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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA. */ #ifndef TVTIME_PLUGINS_H_INCLUDED diff --git a/src/post/deinterlace/pulldown.c b/src/post/deinterlace/pulldown.c index cb263ccfb..4f6247444 100644 --- a/src/post/deinterlace/pulldown.c +++ b/src/post/deinterlace/pulldown.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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA. */ #ifdef HAVE_CONFIG_H diff --git a/src/post/deinterlace/pulldown.h b/src/post/deinterlace/pulldown.h index 13868f30f..0dc9781cb 100644 --- a/src/post/deinterlace/pulldown.h +++ b/src/post/deinterlace/pulldown.h @@ -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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA. */ #ifndef PULLDOWN_H_INCLUDED diff --git a/src/post/deinterlace/speedtools.h b/src/post/deinterlace/speedtools.h index 059d8a5f3..94ab1918d 100644 --- a/src/post/deinterlace/speedtools.h +++ b/src/post/deinterlace/speedtools.h @@ -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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA. */ #ifndef SPEEDTOOLS_H_INCLUDED diff --git a/src/post/deinterlace/speedy.c b/src/post/deinterlace/speedy.c index 0cf07258b..a980780d7 100644 --- a/src/post/deinterlace/speedy.c +++ b/src/post/deinterlace/speedy.c @@ -14,7 +14,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. + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA. */ /** @@ -1912,7 +1912,7 @@ static void a8_subpix_blit_scanline_c( uint8_t *output, uint8_t *input, * * 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. */ #define FP_BITS 18 diff --git a/src/post/deinterlace/speedy.h b/src/post/deinterlace/speedy.h index 7bc1a6535..b4ad56393 100644 --- a/src/post/deinterlace/speedy.h +++ b/src/post/deinterlace/speedy.h @@ -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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA. */ #ifndef SPEEDY_H_INCLUDED diff --git a/src/post/deinterlace/tvtime.c b/src/post/deinterlace/tvtime.c index 0c13329ff..eff43d5e8 100644 --- a/src/post/deinterlace/tvtime.c +++ b/src/post/deinterlace/tvtime.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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA. */ #ifdef HAVE_CONFIG_H diff --git a/src/post/deinterlace/tvtime.h b/src/post/deinterlace/tvtime.h index 1cba7b1a9..8e4c5abc2 100644 --- a/src/post/deinterlace/tvtime.h +++ b/src/post/deinterlace/tvtime.h @@ -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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA. */ #ifndef TVTIME_H_INCLUDED diff --git a/src/post/deinterlace/xine_plugin.c b/src/post/deinterlace/xine_plugin.c index f0f8879bc..de3d3a4e7 100644 --- a/src/post/deinterlace/xine_plugin.c +++ b/src/post/deinterlace/xine_plugin.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: xine_plugin.c,v 1.52 2006/07/12 21:08:46 dsalt Exp $ * diff --git a/src/post/goom/xine_goom.c b/src/post/goom/xine_goom.c index 500ae34ea..05095dc95 100644 --- a/src/post/goom/xine_goom.c +++ b/src/post/goom/xine_goom.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: xine_goom.c,v 1.65 2007/02/20 00:58:51 dgp85 Exp $ * diff --git a/src/post/mosaico/mosaico.c b/src/post/mosaico/mosaico.c index cc7fefe2c..51bf8e5b0 100644 --- a/src/post/mosaico/mosaico.c +++ b/src/post/mosaico/mosaico.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: mosaico.c,v 1.28 2006/07/10 22:08:44 dgp85 Exp $ */ diff --git a/src/post/mosaico/switch.c b/src/post/mosaico/switch.c index 38bd98a66..6c584d368 100644 --- a/src/post/mosaico/switch.c +++ b/src/post/mosaico/switch.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: switch.c,v 1.18 2006/07/10 22:08:44 dgp85 Exp $ */ 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 $ * diff --git a/src/post/visualizations/fft.c b/src/post/visualizations/fft.c index fba3cb8ad..e9a99911a 100644 --- a/src/post/visualizations/fft.c +++ b/src/post/visualizations/fft.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 * * FFT code by Steve Haehnichen, originally licensed under GPL v1 * modified by Thibaut Mattern (tmattern@noos.fr) to remove global vars diff --git a/src/post/visualizations/fft.h b/src/post/visualizations/fft.h index 1ab501be5..dff3cd7e8 100644 --- a/src/post/visualizations/fft.h +++ b/src/post/visualizations/fft.h @@ -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 * */ #ifndef FFT_H diff --git a/src/post/visualizations/fftgraph.c b/src/post/visualizations/fftgraph.c index a73e8eeee..dad1c033d 100644 --- a/src/post/visualizations/fftgraph.c +++ b/src/post/visualizations/fftgraph.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 * * FftGraph Visualization Post Plugin For xine * by Thibaut Mattern (tmattern@noos.fr) diff --git a/src/post/visualizations/fftscope.c b/src/post/visualizations/fftscope.c index 364421bd1..4c7d41dde 100644 --- a/src/post/visualizations/fftscope.c +++ b/src/post/visualizations/fftscope.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 * * Fast Fourier Transform Visualization Post Plugin For xine * by Mike Melanson (melanson@pcisys.net) diff --git a/src/post/visualizations/fooviz.c b/src/post/visualizations/fooviz.c index 02ebea7da..c287408e9 100644 --- a/src/post/visualizations/fooviz.c +++ b/src/post/visualizations/fooviz.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 * * Reference Visualization Post Plugin For xine * by Mike Melanson (melanson@pcisys.net) diff --git a/src/post/visualizations/oscope.c b/src/post/visualizations/oscope.c index 2c3e7dd45..b96962fb9 100644 --- a/src/post/visualizations/oscope.c +++ b/src/post/visualizations/oscope.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 * * Basic Oscilloscope Visualization Post Plugin For xine * by Mike Melanson (melanson@pcisys.net) diff --git a/src/post/visualizations/visualizations.c b/src/post/visualizations/visualizations.c index befd8ca4c..72180a67b 100644 --- a/src/post/visualizations/visualizations.c +++ b/src/post/visualizations/visualizations.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 * * This file contains plugin entries for several visualization post plugins. * diff --git a/src/post/visualizations/visualizations.h b/src/post/visualizations/visualizations.h index 967d98c35..c6ea96f1d 100644 --- a/src/post/visualizations/visualizations.h +++ b/src/post/visualizations/visualizations.h @@ -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 * * This file contains plugin entries for several visualization post plugins. * diff --git a/src/video_out/macosx/XineOpenGLView.h b/src/video_out/macosx/XineOpenGLView.h index b63738047..69e2905b0 100644 --- a/src/video_out/macosx/XineOpenGLView.h +++ b/src/video_out/macosx/XineOpenGLView.h @@ -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 * */ diff --git a/src/video_out/macosx/XineOpenGLView.m b/src/video_out/macosx/XineOpenGLView.m index c29f95dc7..a9ffee00f 100644 --- a/src/video_out/macosx/XineOpenGLView.m +++ b/src/video_out/macosx/XineOpenGLView.m @@ -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 * */ diff --git a/src/video_out/macosx/XineVideoWindow.h b/src/video_out/macosx/XineVideoWindow.h index 2ff617242..c8f9b5940 100644 --- a/src/video_out/macosx/XineVideoWindow.h +++ b/src/video_out/macosx/XineVideoWindow.h @@ -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 * */ diff --git a/src/video_out/macosx/XineVideoWindow.m b/src/video_out/macosx/XineVideoWindow.m index 0dd2caa28..f3a9400d9 100644 --- a/src/video_out/macosx/XineVideoWindow.m +++ b/src/video_out/macosx/XineVideoWindow.m @@ -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 * * Written by Daniel Mack <xine@zonque.org> * diff --git a/src/video_out/macosx/video_window.h b/src/video_out/macosx/video_window.h index 07405b8fe..b46ac43fe 100644 --- a/src/video_out/macosx/video_window.h +++ b/src/video_out/macosx/video_window.h @@ -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 * * Written by Daniel Mack <xine@zonque.org> * diff --git a/src/video_out/video_out_aa.c b/src/video_out/video_out_aa.c index f5fd8ef38..aba801e1b 100644 --- a/src/video_out/video_out_aa.c +++ b/src/video_out/video_out_aa.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: video_out_aa.c,v 1.49 2006/07/10 22:08:44 dgp85 Exp $ * diff --git a/src/video_out/video_out_caca.c b/src/video_out/video_out_caca.c index ad482af8d..3dbf02daa 100644 --- a/src/video_out/video_out_caca.c +++ b/src/video_out/video_out_caca.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: video_out_caca.c,v 1.9 2006/09/14 00:44:19 dgp85 Exp $ * diff --git a/src/video_out/video_out_directfb.c b/src/video_out/video_out_directfb.c index a374c56de..523da11c1 100644 --- a/src/video_out/video_out_directfb.c +++ b/src/video_out/video_out_directfb.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 * * * DirectFB based output plugin by Claudio Ciccani <klan@directfb.org> diff --git a/src/video_out/video_out_directfb_fb.c b/src/video_out/video_out_directfb_fb.c index 182a56941..b904407c3 100644 --- a/src/video_out/video_out_directfb_fb.c +++ b/src/video_out/video_out_directfb_fb.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 * * * DirectFB output plugin (console version wrapper) diff --git a/src/video_out/video_out_directfb_x.c b/src/video_out/video_out_directfb_x.c index b3a1f53b7..48f709eae 100644 --- a/src/video_out/video_out_directfb_x.c +++ b/src/video_out/video_out_directfb_x.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 * * * DirectFB output plugin (X version wrapper) diff --git a/src/video_out/video_out_directx.c b/src/video_out/video_out_directx.c index 7c3e5a78c..0928af12e 100755 --- a/src/video_out/video_out_directx.c +++ b/src/video_out/video_out_directx.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 * * video_out_directx.c, direct draw video output plugin for xine * by Matthew Grooms <elon@altavista.com> diff --git a/src/video_out/video_out_fb.c b/src/video_out/video_out_fb.c index 3ca39b89d..0b04acf3d 100644 --- a/src/video_out/video_out_fb.c +++ b/src/video_out/video_out_fb.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: video_out_fb.c,v 1.49 2006/12/19 19:10:51 dsalt Exp $ */ diff --git a/src/video_out/video_out_none.c b/src/video_out/video_out_none.c index 8f1ee3968..ca3147839 100644 --- a/src/video_out/video_out_none.c +++ b/src/video_out/video_out_none.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: video_out_none.c,v 1.27 2006/07/10 22:08:44 dgp85 Exp $ * diff --git a/src/video_out/video_out_opengl.c b/src/video_out/video_out_opengl.c index a027f2e06..78b8be7e3 100644 --- a/src/video_out/video_out_opengl.c +++ b/src/video_out/video_out_opengl.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: video_out_opengl.c,v 1.59 2006/07/10 22:08:44 dgp85 Exp $ * diff --git a/src/video_out/video_out_pgx32.c b/src/video_out/video_out_pgx32.c index 2c18a3d77..7536d3359 100644 --- a/src/video_out/video_out_pgx32.c +++ b/src/video_out/video_out_pgx32.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: video_out_pgx32.c,v 1.17 2006/07/10 22:08:44 dgp85 Exp $ * diff --git a/src/video_out/video_out_pgx64.c b/src/video_out/video_out_pgx64.c index 1474c4354..8533b6b6d 100644 --- a/src/video_out/video_out_pgx64.c +++ b/src/video_out/video_out_pgx64.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: video_out_pgx64.c,v 1.78 2006/07/10 22:08:44 dgp85 Exp $ * diff --git a/src/video_out/video_out_sdl.c b/src/video_out/video_out_sdl.c index 77496b59b..25d417a11 100644 --- a/src/video_out/video_out_sdl.c +++ b/src/video_out/video_out_sdl.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: video_out_sdl.c,v 1.48 2006/07/10 22:08:44 dgp85 Exp $ * diff --git a/src/video_out/video_out_stk.c b/src/video_out/video_out_stk.c index 2e5708874..a04b12584 100644 --- a/src/video_out/video_out_stk.c +++ b/src/video_out/video_out_stk.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: video_out_stk.c,v 1.19 2006/07/10 22:08:44 dgp85 Exp $ * diff --git a/src/video_out/video_out_syncfb.c b/src/video_out/video_out_syncfb.c index f03d0ea97..76919b75e 100644 --- a/src/video_out/video_out_syncfb.c +++ b/src/video_out/video_out_syncfb.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: video_out_syncfb.c,v 1.108 2006/12/19 19:10:51 dsalt Exp $ * diff --git a/src/video_out/video_out_vidix.c b/src/video_out/video_out_vidix.c index b90a162ca..1a8ee43d3 100644 --- a/src/video_out/video_out_vidix.c +++ b/src/video_out/video_out_vidix.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: video_out_vidix.c,v 1.75 2006/12/19 19:10:51 dsalt Exp $ * diff --git a/src/video_out/video_out_xcbshm.c b/src/video_out/video_out_xcbshm.c index bc31e153a..d18f49ec4 100644 --- a/src/video_out/video_out_xcbshm.c +++ b/src/video_out/video_out_xcbshm.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: video_out_xcbshm.c,v 1.3 2007/03/25 23:13:53 dgp85 Exp $ * diff --git a/src/video_out/video_out_xcbxv.c b/src/video_out/video_out_xcbxv.c index 84185bb85..a4716aa43 100644 --- a/src/video_out/video_out_xcbxv.c +++ b/src/video_out/video_out_xcbxv.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: video_out_xcbxv.c,v 1.6 2007/03/29 18:58:21 dgp85 Exp $ * diff --git a/src/video_out/video_out_xshm.c b/src/video_out/video_out_xshm.c index 54747e1a9..eeaebf287 100644 --- a/src/video_out/video_out_xshm.c +++ b/src/video_out/video_out_xshm.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: video_out_xshm.c,v 1.150 2007/03/25 23:13:53 dgp85 Exp $ * diff --git a/src/video_out/video_out_xv.c b/src/video_out/video_out_xv.c index 100129fdb..9c5e6f861 100644 --- a/src/video_out/video_out_xv.c +++ b/src/video_out/video_out_xv.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: video_out_xv.c,v 1.224 2007/03/29 19:01:03 dgp85 Exp $ * diff --git a/src/video_out/video_out_xvmc.c b/src/video_out/video_out_xvmc.c index 77016dc81..8b2ca79ea 100644 --- a/src/video_out/video_out_xvmc.c +++ b/src/video_out/video_out_xvmc.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: video_out_xvmc.c,v 1.29 2007/03/25 23:07:23 dgp85 Exp $ * diff --git a/src/video_out/video_out_xxmc.c b/src/video_out/video_out_xxmc.c index 0f1040685..8477a22c3 100644 --- a/src/video_out/video_out_xxmc.c +++ b/src/video_out/video_out_xxmc.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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * $Id: video_out_xxmc.c,v 1.23 2007/03/25 23:13:53 dgp85 Exp $ * diff --git a/src/video_out/x11osd.c b/src/video_out/x11osd.c index dbfa53ec7..3b505ead5 100644 --- a/src/video_out/x11osd.c +++ b/src/video_out/x11osd.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: x11osd.c,v 1.15 2005/09/25 00:44:04 miguelfreitas Exp $ * diff --git a/src/video_out/x11osd.h b/src/video_out/x11osd.h index 3fae9968d..45aae22f8 100644 --- a/src/video_out/x11osd.h +++ b/src/video_out/x11osd.h @@ -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: x11osd.h,v 1.4 2004/04/10 15:31:10 miguelfreitas Exp $ * diff --git a/src/video_out/xcbosd.c b/src/video_out/xcbosd.c index 9013bab10..06e29bf32 100644 --- a/src/video_out/xcbosd.c +++ b/src/video_out/xcbosd.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: xcbosd.c,v 1.1 2007/02/15 15:19:33 dgp85 Exp $ * diff --git a/src/video_out/xcbosd.h b/src/video_out/xcbosd.h index f948c9baf..89540e846 100644 --- a/src/video_out/xcbosd.h +++ b/src/video_out/xcbosd.h @@ -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: xcbosd.h,v 1.1 2007/02/15 15:19:33 dgp85 Exp $ * diff --git a/src/video_out/xvmc_mocomp.c b/src/video_out/xvmc_mocomp.c index bf05a79d3..18b8f6121 100644 --- a/src/video_out/xvmc_mocomp.c +++ b/src/video_out/xvmc_mocomp.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: xvmc_mocomp.c,v 1.4 2005/05/06 07:42:21 totte67 Exp $ * diff --git a/src/video_out/xvmc_vld.c b/src/video_out/xvmc_vld.c index ce1c82742..6b6757908 100644 --- a/src/video_out/xvmc_vld.c +++ b/src/video_out/xvmc_vld.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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * $Id: xvmc_vld.c,v 1.4 2005/05/06 07:42:21 totte67 Exp $ * diff --git a/src/video_out/xxmc.h b/src/video_out/xxmc.h index bb6ace157..920ee5c43 100644 --- a/src/video_out/xxmc.h +++ b/src/video_out/xxmc.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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * $Id: xxmc.h,v 1.9 2005/09/25 00:44:04 miguelfreitas Exp $ * diff --git a/src/video_out/yuv2rgb.c b/src/video_out/yuv2rgb.c index 5fc04f688..62b332c33 100644 --- a/src/video_out/yuv2rgb.c +++ b/src/video_out/yuv2rgb.c @@ -21,7 +21,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: yuv2rgb.c,v 1.52 2006/06/20 01:07:59 dgp85 Exp $ */ diff --git a/src/video_out/yuv2rgb_mlib.c b/src/video_out/yuv2rgb_mlib.c index bbc8901e8..8635526ed 100644 --- a/src/video_out/yuv2rgb_mlib.c +++ b/src/video_out/yuv2rgb_mlib.c @@ -19,7 +19,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 */ #include "config.h" diff --git a/src/video_out/yuv2rgb_mmx.c b/src/video_out/yuv2rgb_mmx.c index 4cbd7d29e..20a9b5a00 100644 --- a/src/video_out/yuv2rgb_mmx.c +++ b/src/video_out/yuv2rgb_mmx.c @@ -19,7 +19,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 */ #include "config.h" diff --git a/src/xine-engine/accel_xvmc.h b/src/xine-engine/accel_xvmc.h index d60246c3e..3e7078f6f 100644 --- a/src/xine-engine/accel_xvmc.h +++ b/src/xine-engine/accel_xvmc.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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * $Id: accel_xvmc.h,v 1.3 2005/05/06 07:42:21 totte67 Exp $ * diff --git a/src/xine-engine/alphablend.c b/src/xine-engine/alphablend.c index 57f8213cb..4dffa09ad 100644 --- a/src/xine-engine/alphablend.c +++ b/src/xine-engine/alphablend.c @@ -17,7 +17,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, USA. * *------------------------------------------------------------ * diff --git a/src/xine-engine/alphablend.h b/src/xine-engine/alphablend.h index 4fc879b2c..f8c9ad540 100644 --- a/src/xine-engine/alphablend.h +++ b/src/xine-engine/alphablend.h @@ -14,7 +14,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, USA. * * The author may be reached as <dent@linuxvideo.org> * diff --git a/src/xine-engine/audio_decoder.c b/src/xine-engine/audio_decoder.c index c271fc6fc..cdfe9858f 100644 --- a/src/xine-engine/audio_decoder.c +++ b/src/xine-engine/audio_decoder.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: audio_decoder.c,v 1.139 2007/02/20 00:34:57 dgp85 Exp $ * diff --git a/src/xine-engine/audio_decoder.h b/src/xine-engine/audio_decoder.h index a88b02dc8..84d579efb 100644 --- a/src/xine-engine/audio_decoder.h +++ b/src/xine-engine/audio_decoder.h @@ -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: audio_decoder.h,v 1.13 2004/09/26 22:54:52 valtri Exp $ * diff --git a/src/xine-engine/audio_out.c b/src/xine-engine/audio_out.c index 3c7533138..f50118c60 100644 --- a/src/xine-engine/audio_out.c +++ b/src/xine-engine/audio_out.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with self 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 */ /** diff --git a/src/xine-engine/audio_out.h b/src/xine-engine/audio_out.h index f4e01ad25..8cd81d7a9 100644 --- a/src/xine-engine/audio_out.h +++ b/src/xine-engine/audio_out.h @@ -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: audio_out.h,v 1.77 2006/09/26 05:19:48 dgp85 Exp $ */ diff --git a/src/xine-engine/broadcaster.c b/src/xine-engine/broadcaster.c index 43390ede5..8e77c6711 100644 --- a/src/xine-engine/broadcaster.c +++ b/src/xine-engine/broadcaster.c @@ -17,7 +17,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: broadcaster.c,v 1.15 2007/01/19 01:23:06 dgp85 Exp $ * diff --git a/src/xine-engine/broadcaster.h b/src/xine-engine/broadcaster.h index bc0d2feab..1e910f924 100644 --- a/src/xine-engine/broadcaster.h +++ b/src/xine-engine/broadcaster.h @@ -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: broadcaster.h,v 1.3 2006/09/26 05:19:48 dgp85 Exp $ * diff --git a/src/xine-engine/bswap.h b/src/xine-engine/bswap.h index 28b22cb71..635c6ae3a 100644 --- a/src/xine-engine/bswap.h +++ b/src/xine-engine/bswap.h @@ -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 */ #ifndef __BSWAP_H__ diff --git a/src/xine-engine/buffer.c b/src/xine-engine/buffer.c index 389146dcb..c595e547c 100644 --- a/src/xine-engine/buffer.c +++ b/src/xine-engine/buffer.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: buffer.c,v 1.37 2006/12/25 21:59:32 dgp85 Exp $ * diff --git a/src/xine-engine/buffer.h b/src/xine-engine/buffer.h index 9c5dbb2a5..5ad048084 100644 --- a/src/xine-engine/buffer.h +++ b/src/xine-engine/buffer.h @@ -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: buffer.h,v 1.162 2007/01/14 16:53:37 klan Exp $ * diff --git a/src/xine-engine/buffer_types.c b/src/xine-engine/buffer_types.c index 0421fecc8..91e1d38d8 100644 --- a/src/xine-engine/buffer_types.c +++ b/src/xine-engine/buffer_types.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: buffer_types.c,v 1.107 2006/12/26 03:18:56 dgp85 Exp $ * diff --git a/src/xine-engine/configfile.c b/src/xine-engine/configfile.c index cc3f21db8..eb8e4972a 100644 --- a/src/xine-engine/configfile.c +++ b/src/xine-engine/configfile.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: configfile.c,v 1.85 2007/02/22 15:49:16 dgp85 Exp $ * diff --git a/src/xine-engine/configfile.h b/src/xine-engine/configfile.h index cf4a9703f..4c9f315c3 100644 --- a/src/xine-engine/configfile.h +++ b/src/xine-engine/configfile.h @@ -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: configfile.h,v 1.42 2007/02/22 15:49:16 dgp85 Exp $ * diff --git a/src/xine-engine/demux.c b/src/xine-engine/demux.c index d1bd2bc1d..9cdbea87a 100644 --- a/src/xine-engine/demux.c +++ b/src/xine-engine/demux.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 * * Demuxer helper functions * hide some xine engine details from demuxers and reduce code duplication diff --git a/src/xine-engine/events.c b/src/xine-engine/events.c index 990cbe787..642ca21b1 100644 --- a/src/xine-engine/events.c +++ b/src/xine-engine/events.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: events.c,v 1.32 2006/10/16 22:18:24 valtri Exp $ * diff --git a/src/xine-engine/info_helper.c b/src/xine-engine/info_helper.c index e38b5e5c4..a39fdc9a0 100644 --- a/src/xine-engine/info_helper.c +++ b/src/xine-engine/info_helper.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 * * stream metainfo helper functions * hide some xine engine details from demuxers and reduce code duplication diff --git a/src/xine-engine/info_helper.h b/src/xine-engine/info_helper.h index a21372e22..d4123ba2b 100644 --- a/src/xine-engine/info_helper.h +++ b/src/xine-engine/info_helper.h @@ -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 * * stream metainfo helper functions * hide some xine engine details from demuxers and reduce code duplication diff --git a/src/xine-engine/input_cache.c b/src/xine-engine/input_cache.c index 7537c4d16..c54a57c08 100644 --- a/src/xine-engine/input_cache.c +++ b/src/xine-engine/input_cache.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 * * Buffered Input Plugin (request optimizer). * diff --git a/src/xine-engine/input_rip.c b/src/xine-engine/input_rip.c index 774ef82c5..2c9d20c82 100644 --- a/src/xine-engine/input_rip.c +++ b/src/xine-engine/input_rip.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 * * Rip Input Plugin for catching streams * diff --git a/src/xine-engine/io_helper.c b/src/xine-engine/io_helper.c index 67dddcfdc..c3654c762 100644 --- a/src/xine-engine/io_helper.c +++ b/src/xine-engine/io_helper.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 * * abortable i/o helper functions */ diff --git a/src/xine-engine/io_helper.h b/src/xine-engine/io_helper.h index 3b7cac17a..3e96e8dc1 100644 --- a/src/xine-engine/io_helper.h +++ b/src/xine-engine/io_helper.h @@ -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 * * abortable i/o helper functions */ diff --git a/src/xine-engine/load_plugins.c b/src/xine-engine/load_plugins.c index e7ced7a5e..c34d58b09 100644 --- a/src/xine-engine/load_plugins.c +++ b/src/xine-engine/load_plugins.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: load_plugins.c,v 1.230 2007/02/19 23:33:33 dgp85 Exp $ * diff --git a/src/xine-engine/lrb.c b/src/xine-engine/lrb.c index 87465aaef..83214a0ea 100644 --- a/src/xine-engine/lrb.c +++ b/src/xine-engine/lrb.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: lrb.c,v 1.8 2003/12/09 00:02:36 f1rmb Exp $ * diff --git a/src/xine-engine/lrb.h b/src/xine-engine/lrb.h index 1b53ed929..cf24abb62 100644 --- a/src/xine-engine/lrb.h +++ b/src/xine-engine/lrb.h @@ -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: lrb.h,v 1.4 2003/12/09 00:02:36 f1rmb Exp $ * diff --git a/src/xine-engine/metronom.c b/src/xine-engine/metronom.c index 50720e157..f83dd867e 100644 --- a/src/xine-engine/metronom.c +++ b/src/xine-engine/metronom.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: metronom.c,v 1.144 2007/02/20 00:34:57 dgp85 Exp $ */ diff --git a/src/xine-engine/metronom.h b/src/xine-engine/metronom.h index e4115b6ad..dab25a450 100644 --- a/src/xine-engine/metronom.h +++ b/src/xine-engine/metronom.h @@ -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: metronom.h,v 1.64 2006/09/26 05:19:49 dgp85 Exp $ * diff --git a/src/xine-engine/osd.c b/src/xine-engine/osd.c index ff9cc2176..1587b76e4 100644 --- a/src/xine-engine/osd.c +++ b/src/xine-engine/osd.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 * * OSD stuff (text and graphic primitives) */ diff --git a/src/xine-engine/osd.h b/src/xine-engine/osd.h index e8212acff..d84ce55bf 100644 --- a/src/xine-engine/osd.h +++ b/src/xine-engine/osd.h @@ -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 * * OSD stuff (text and graphic primitives) * $Id: osd.h,v 1.27 2006/09/26 05:19:49 dgp85 Exp $ diff --git a/src/xine-engine/plugin_catalog.h b/src/xine-engine/plugin_catalog.h index 5533ab374..e5f01158a 100644 --- a/src/xine-engine/plugin_catalog.h +++ b/src/xine-engine/plugin_catalog.h @@ -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: plugin_catalog.h,v 1.21 2006/09/26 05:19:49 dgp85 Exp $ * diff --git a/src/xine-engine/post.c b/src/xine-engine/post.c index d153cada9..7c4becbee 100644 --- a/src/xine-engine/post.c +++ b/src/xine-engine/post.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: post.c,v 1.32 2006/01/27 07:46:15 tmattern Exp $ */ diff --git a/src/xine-engine/post.h b/src/xine-engine/post.h index 9f82ffaa1..d02d68005 100644 --- a/src/xine-engine/post.h +++ b/src/xine-engine/post.h @@ -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: post.h,v 1.26 2007/02/20 01:13:08 dgp85 Exp $ * diff --git a/src/xine-engine/refcounter.c b/src/xine-engine/refcounter.c index 18c2ad1ce..f951f3261 100644 --- a/src/xine-engine/refcounter.c +++ b/src/xine-engine/refcounter.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: refcounter.c,v 1.2 2006/09/26 05:19:49 dgp85 Exp $ * diff --git a/src/xine-engine/refcounter.h b/src/xine-engine/refcounter.h index 739a6ad62..de378f7bc 100644 --- a/src/xine-engine/refcounter.h +++ b/src/xine-engine/refcounter.h @@ -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: refcounter.h,v 1.2 2006/09/26 05:19:49 dgp85 Exp $ * diff --git a/src/xine-engine/resample.c b/src/xine-engine/resample.c index 1bc9dfaf9..d73349039 100644 --- a/src/xine-engine/resample.c +++ b/src/xine-engine/resample.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: resample.c,v 1.10 2006/09/26 05:19:49 dgp85 Exp $ */ diff --git a/src/xine-engine/resample.h b/src/xine-engine/resample.h index 1fd478d06..c291917b6 100644 --- a/src/xine-engine/resample.h +++ b/src/xine-engine/resample.h @@ -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: resample.h,v 1.6 2006/09/26 05:19:49 dgp85 Exp $ * diff --git a/src/xine-engine/scratch.c b/src/xine-engine/scratch.c index ddca0cfaf..dfeaa4907 100644 --- a/src/xine-engine/scratch.c +++ b/src/xine-engine/scratch.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: scratch.c,v 1.24 2007/01/19 00:12:22 dgp85 Exp $ * diff --git a/src/xine-engine/scratch.h b/src/xine-engine/scratch.h index bcfe815c3..124afd2be 100644 --- a/src/xine-engine/scratch.h +++ b/src/xine-engine/scratch.h @@ -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: scratch.h,v 1.13 2007/01/19 00:12:22 dgp85 Exp $ * diff --git a/src/xine-engine/tvmode.c b/src/xine-engine/tvmode.c index b7a34e673..0b28ab629 100644 --- a/src/xine-engine/tvmode.c +++ b/src/xine-engine/tvmode.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: tvmode.c,v 1.17 2003/12/09 00:02:37 f1rmb Exp $ * diff --git a/src/xine-engine/video_decoder.c b/src/xine-engine/video_decoder.c index 3d39b4550..585e83c14 100644 --- a/src/xine-engine/video_decoder.c +++ b/src/xine-engine/video_decoder.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: video_decoder.c,v 1.163 2007/02/20 00:34:58 dgp85 Exp $ * diff --git a/src/xine-engine/video_decoder.h b/src/xine-engine/video_decoder.h index 42120b724..e721f9e8d 100644 --- a/src/xine-engine/video_decoder.h +++ b/src/xine-engine/video_decoder.h @@ -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: video_decoder.h,v 1.14 2004/09/26 22:54:52 valtri Exp $ * diff --git a/src/xine-engine/video_out.c b/src/xine-engine/video_out.c index eeade3f48..f07244428 100644 --- a/src/xine-engine/video_out.c +++ b/src/xine-engine/video_out.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: video_out.c,v 1.228 2007/04/01 01:03:06 dgp85 Exp $ * diff --git a/src/xine-engine/video_out.h b/src/xine-engine/video_out.h index bd169acfe..aceb1b6e5 100644 --- a/src/xine-engine/video_out.h +++ b/src/xine-engine/video_out.h @@ -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: video_out.h,v 1.114 2006/09/26 05:19:49 dgp85 Exp $ * diff --git a/src/xine-engine/video_overlay.c b/src/xine-engine/video_overlay.c index 574f42ac3..9d4961501 100644 --- a/src/xine-engine/video_overlay.c +++ b/src/xine-engine/video_overlay.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: video_overlay.c,v 1.41 2006/09/26 00:28:14 dgp85 Exp $ * diff --git a/src/xine-engine/video_overlay.h b/src/xine-engine/video_overlay.h index 5e3455461..a6ff1d7c4 100644 --- a/src/xine-engine/video_overlay.h +++ b/src/xine-engine/video_overlay.h @@ -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: video_overlay.h,v 1.21 2006/09/26 05:19:49 dgp85 Exp $ * diff --git a/src/xine-engine/vo_scale.c b/src/xine-engine/vo_scale.c index b2f3001d0..c2098b9cd 100644 --- a/src/xine-engine/vo_scale.c +++ b/src/xine-engine/vo_scale.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: vo_scale.c,v 1.39 2006/09/26 08:00:02 dgp85 Exp $ * diff --git a/src/xine-engine/vo_scale.h b/src/xine-engine/vo_scale.h index 793ab1eb7..fe89f49f4 100644 --- a/src/xine-engine/vo_scale.h +++ b/src/xine-engine/vo_scale.h @@ -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: vo_scale.h,v 1.14 2006/09/26 05:19:49 dgp85 Exp $ * diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c index 2d3b32176..cddca009a 100644 --- a/src/xine-engine/xine.c +++ b/src/xine-engine/xine.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: xine.c,v 1.342 2007/02/20 00:37:02 dgp85 Exp $ */ diff --git a/src/xine-engine/xine_interface.c b/src/xine-engine/xine_interface.c index a4a7ecbf9..fbb1b6758 100644 --- a/src/xine-engine/xine_interface.c +++ b/src/xine-engine/xine_interface.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: xine_interface.c,v 1.104 2007/03/26 11:48:01 dgp85 Exp $ * diff --git a/src/xine-engine/xine_internal.h b/src/xine-engine/xine_internal.h index e4af27b92..cc4ca1921 100644 --- a/src/xine-engine/xine_internal.h +++ b/src/xine-engine/xine_internal.h @@ -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: xine_internal.h,v 1.181 2007/01/18 23:28:46 dgp85 Exp $ * diff --git a/src/xine-engine/xine_plugin.h b/src/xine-engine/xine_plugin.h index 4ddb65eda..44b269d4c 100644 --- a/src/xine-engine/xine_plugin.h +++ b/src/xine-engine/xine_plugin.h @@ -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: xine_plugin.h,v 1.23 2007/01/19 02:49:31 dgp85 Exp $ * diff --git a/src/xine-engine/xineintl.h b/src/xine-engine/xineintl.h index 614195193..2af09d752 100644 --- a/src/xine-engine/xineintl.h +++ b/src/xine-engine/xineintl.h @@ -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: xineintl.h,v 1.9 2005/02/19 13:11:53 valtri Exp $ * diff --git a/src/xine-utils/array.c b/src/xine-utils/array.c index ed529515b..9b514b59c 100644 --- a/src/xine-utils/array.c +++ b/src/xine-utils/array.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: array.c,v 1.4 2007/02/03 16:31:55 dsalt Exp $ * diff --git a/src/xine-utils/array.h b/src/xine-utils/array.h index 80b7d3c9b..d23a77a52 100644 --- a/src/xine-utils/array.h +++ b/src/xine-utils/array.h @@ -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: array.h,v 1.3 2007/02/03 16:31:55 dsalt Exp $ * diff --git a/src/xine-utils/attributes.h b/src/xine-utils/attributes.h index a9be4792f..b25c76572 100644 --- a/src/xine-utils/attributes.h +++ b/src/xine-utils/attributes.h @@ -18,7 +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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ /* use gcc attribs to align critical data structures */ diff --git a/src/xine-utils/color.c b/src/xine-utils/color.c index c5d42be9d..261dbe204 100644 --- a/src/xine-utils/color.c +++ b/src/xine-utils/color.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 * * Color Conversion Utility Functions * diff --git a/src/xine-utils/compat.h b/src/xine-utils/compat.h index a6592b030..045fa8368 100644 --- a/src/xine-utils/compat.h +++ b/src/xine-utils/compat.h @@ -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: compat.h,v 1.3 2003/04/20 21:13:26 guenter Exp $ * diff --git a/src/xine-utils/copy.c b/src/xine-utils/copy.c index 1a609ed89..ed42b3a88 100644 --- a/src/xine-utils/copy.c +++ b/src/xine-utils/copy.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/xine-utils/cpu_accel.c b/src/xine-utils/cpu_accel.c index 06ee90cd3..8bad23db9 100644 --- a/src/xine-utils/cpu_accel.c +++ b/src/xine-utils/cpu_accel.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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ #include "config.h" diff --git a/src/xine-utils/list.c b/src/xine-utils/list.c index 2c790c3db..a440ade9c 100644 --- a/src/xine-utils/list.c +++ b/src/xine-utils/list.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: list.c,v 1.12 2006/09/26 05:19:49 dgp85 Exp $ * diff --git a/src/xine-utils/list.h b/src/xine-utils/list.h index 8273d30f1..ac1c91b5a 100644 --- a/src/xine-utils/list.h +++ b/src/xine-utils/list.h @@ -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: list.h,v 1.5 2007/02/19 23:34:32 dgp85 Exp $ * diff --git a/src/xine-utils/memcpy.c b/src/xine-utils/memcpy.c index 67645081e..da4b83b09 100644 --- a/src/xine-utils/memcpy.c +++ b/src/xine-utils/memcpy.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 * * These are the MMX/MMX2/SSE optimized versions of memcpy * diff --git a/src/xine-utils/monitor.c b/src/xine-utils/monitor.c index b19195065..ad1bfc5e7 100644 --- a/src/xine-utils/monitor.c +++ b/src/xine-utils/monitor.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: monitor.c,v 1.8 2006/06/23 18:24:22 dsalt Exp $ * diff --git a/src/xine-utils/pool.c b/src/xine-utils/pool.c index 39dbccb0c..cd0e40b0d 100644 --- a/src/xine-utils/pool.c +++ b/src/xine-utils/pool.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: pool.c,v 1.2 2006/09/26 05:19:49 dgp85 Exp $ * diff --git a/src/xine-utils/pool.h b/src/xine-utils/pool.h index 5f6e4bd7e..01ef69556 100644 --- a/src/xine-utils/pool.h +++ b/src/xine-utils/pool.h @@ -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: pool.h,v 1.2 2006/09/26 05:19:49 dgp85 Exp $ * diff --git a/src/xine-utils/ring_buffer.c b/src/xine-utils/ring_buffer.c index dc8ddbf80..ed3b3aee9 100644 --- a/src/xine-utils/ring_buffer.c +++ b/src/xine-utils/ring_buffer.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: ring_buffer.c,v 1.5 2006/09/26 05:19:49 dgp85 Exp $ * diff --git a/src/xine-utils/ring_buffer.h b/src/xine-utils/ring_buffer.h index fc826ba21..1c5bbcf51 100644 --- a/src/xine-utils/ring_buffer.h +++ b/src/xine-utils/ring_buffer.h @@ -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: ring_buffer.h,v 1.3 2006/09/26 05:19:49 dgp85 Exp $ * diff --git a/src/xine-utils/sorted_array.c b/src/xine-utils/sorted_array.c index c69d92d40..c3dad54c9 100644 --- a/src/xine-utils/sorted_array.c +++ b/src/xine-utils/sorted_array.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: sorted_array.c,v 1.3 2006/09/26 05:19:49 dgp85 Exp $ * diff --git a/src/xine-utils/sorted_array.h b/src/xine-utils/sorted_array.h index 767a2913c..9a4d61bd8 100644 --- a/src/xine-utils/sorted_array.h +++ b/src/xine-utils/sorted_array.h @@ -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: sorted_array.h,v 1.3 2006/09/26 05:19:49 dgp85 Exp $ * diff --git a/src/xine-utils/utils.c b/src/xine-utils/utils.c index f79d2ebce..20286e7f6 100644 --- a/src/xine-utils/utils.c +++ b/src/xine-utils/utils.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: utils.c,v 1.46 2006/07/21 04:47:17 dgp85 Exp $ * diff --git a/src/xine-utils/xine_buffer.c b/src/xine-utils/xine_buffer.c index 17b3a79db..842253ecb 100644 --- a/src/xine-utils/xine_buffer.c +++ b/src/xine-utils/xine_buffer.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: xine_buffer.c,v 1.11 2006/06/23 18:24:22 dsalt Exp $ * diff --git a/src/xine-utils/xine_buffer.h b/src/xine-utils/xine_buffer.h index 02a9e2cb1..b1c99ee34 100644 --- a/src/xine-utils/xine_buffer.h +++ b/src/xine-utils/xine_buffer.h @@ -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: xine_buffer.h,v 1.7 2006/09/26 05:19:49 dgp85 Exp $ * diff --git a/src/xine-utils/xine_check.c b/src/xine-utils/xine_check.c index f6a0498e8..f00a23832 100644 --- a/src/xine-utils/xine_check.c +++ b/src/xine-utils/xine_check.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 * * Xine Health Check: * diff --git a/src/xine-utils/xine_mutex.c b/src/xine-utils/xine_mutex.c index e6b5025c8..9c2943ea0 100644 --- a/src/xine-utils/xine_mutex.c +++ b/src/xine-utils/xine_mutex.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: xine_mutex.c,v 1.5 2006/07/16 14:45:24 dsalt Exp $ * diff --git a/src/xine-utils/xineutils.h b/src/xine-utils/xineutils.h index 980586b7d..9750eefad 100644 --- a/src/xine-utils/xineutils.h +++ b/src/xine-utils/xineutils.h @@ -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: xineutils.h,v 1.107 2006/12/25 15:16:33 dgp85 Exp $ * diff --git a/src/xine-utils/xmllexer.c b/src/xine-utils/xmllexer.c index c0f314699..a9fcd9e31 100644 --- a/src/xine-utils/xmllexer.c +++ b/src/xine-utils/xmllexer.c @@ -15,8 +15,8 @@ * * You should have received a copy of the GNU Library General Public * License along with the Gnome Library; see the file COPYING.LIB. If not, - * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth + * Floor, Boston, MA 02110, USA * * $Id: xmllexer.c,v 1.13 2007/03/04 16:19:12 hadess Exp $ * @@ -39,6 +39,9 @@ #include <ctype.h> #include <string.h> #include <stdlib.h> +#ifdef HAVE_ICONV +#include <iconv.h> +#endif /* private constants*/ @@ -521,7 +524,7 @@ char *lexer_decode_entities (const char *tok) { /* parse the character entity (on failure, treat it as literal text) */ const char *tp = tok; - long i; + signed long i; for (i = 0; lexer_entities[i].code; ++i) if (!strncmp (lexer_entities[i].name, tok, lexer_entities[i].namelen) @@ -549,7 +552,7 @@ char *lexer_decode_entities (const char *tok) else i = strtol (tp, (char **)&tp, 10); - if (i < 1 || i > 255 || *tp != ';') + if (*tp != ';' || i < 1) { /* out of range, or format error */ *bp++ = '&'; @@ -557,7 +560,23 @@ char *lexer_decode_entities (const char *tok) } tok = tp + 1; - *bp++ = i; + + if (i < 128) + /* ASCII - store as-is */ + *bp++ = i; + else + { + /* Non-ASCII, so convert to UTF-8 */ + int count = (i >= 0x04000000) ? 5 : + (i >= 0x00200000) ? 4 : + (i >= 0x00010000) ? 3 : + (i >= 0x00000800) ? 2 : 1; + *bp = (char)(0x1F80 >> count); + count *= 6; + *bp++ |= i >> count; + while ((count -= 6) >= 0) + *bp++ = 128 | ((i >> count) & 0x3F); + } } } *bp = 0; diff --git a/src/xine-utils/xmllexer.h b/src/xine-utils/xmllexer.h index 524049a44..5b6ce8311 100644 --- a/src/xine-utils/xmllexer.h +++ b/src/xine-utils/xmllexer.h @@ -15,8 +15,8 @@ * * You should have received a copy of the GNU Library General Public * License along with the Gnome Library; see the file COPYING.LIB. If not, - * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth + * Floor, Boston, MA 02110, USA * * $Id: xmllexer.h,v 1.8 2007/03/04 16:19:12 hadess Exp $ * diff --git a/src/xine-utils/xmlparser.c b/src/xine-utils/xmlparser.c index 66ab28ce4..21d5a6de9 100644 --- a/src/xine-utils/xmlparser.c +++ b/src/xine-utils/xmlparser.c @@ -15,8 +15,8 @@ * * You should have received a copy of the GNU Library General Public * License along with the Gnome Library; see the file COPYING.LIB. If not, - * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth + * Floor, Boston, MA 02110, USA * * $Id: xmlparser.c,v 1.16 2007/03/04 16:19:12 hadess Exp $ * diff --git a/src/xine-utils/xmlparser.h b/src/xine-utils/xmlparser.h index 420f2c36c..2536e079f 100644 --- a/src/xine-utils/xmlparser.h +++ b/src/xine-utils/xmlparser.h @@ -15,8 +15,8 @@ * * You should have received a copy of the GNU Library General Public * License along with the Gnome Library; see the file COPYING.LIB. If not, - * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth + * Floor, Boston, MA 02110, USA * * $Id: xmlparser.h,v 1.6 2007/03/04 16:19:12 hadess Exp $ * |