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/input/vcd | |
| 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/input/vcd')
| -rw-r--r-- | src/input/vcd/vcdio.c | 2 | ||||
| -rw-r--r-- | src/input/vcd/vcdio.h | 2 | ||||
| -rw-r--r-- | src/input/vcd/vcdplayer.c | 2 | ||||
| -rw-r--r-- | src/input/vcd/vcdplayer.h | 2 | ||||
| -rw-r--r-- | src/input/vcd/xine-extra.c | 2 | ||||
| -rw-r--r-- | src/input/vcd/xine-extra.h | 2 | ||||
| -rw-r--r-- | src/input/vcd/xineplug_inp_vcd.c | 2 |
7 files changed, 7 insertions, 7 deletions
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 */ /* |