summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2007-11-10 23:17:58 +0000
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2007-11-10 23:17:58 +0000
commit840d2394b9d4199a90dbb2f15b907ecdf3ffc0bc (patch)
treed61c21fae3e3c58b78d83207a5816f4814ba7bf2 /misc
parent6163126d81baaac024bc55ddfc34941bc6d2778d (diff)
parent3c175fd21df04c5c0afa160f81aea0c305f69dc5 (diff)
downloadxine-lib-840d2394b9d4199a90dbb2f15b907ecdf3ffc0bc.tar.gz
xine-lib-840d2394b9d4199a90dbb2f15b907ecdf3ffc0bc.tar.bz2
Merge from 1.1.
--HG-- 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/libmad/xine_mad_decoder.c => src/libxineadec/xine_mad_decoder.c rename : src/libmusepack/xine_musepack_decoder.c => src/libxineadec/xine_musepack_decoder.c
Diffstat (limited to 'misc')
-rw-r--r--misc/cdda_server.c22
1 files changed, 21 insertions, 1 deletions
diff --git a/misc/cdda_server.c b/misc/cdda_server.c
index c4b3f44cb..553ec0a8a 100644
--- a/misc/cdda_server.c
+++ b/misc/cdda_server.c
@@ -1,4 +1,24 @@
-/* CDDA / DVD server
+/*
+ * CDDA / DVD server
+ *
+ * Copyright (C) 2003-2007 the xine project
+ *
+ * This file is part of xine, a free video player.
+ *
+ * xine is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * xine is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
+ *
*
* This is a TCP server that can be used with xine's cdda input plugin to
* play audio CDs over the network. It also supports playing DVDs with a