diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-11-10 23:17:58 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-11-10 23:17:58 +0000 |
| commit | 840d2394b9d4199a90dbb2f15b907ecdf3ffc0bc (patch) | |
| tree | d61c21fae3e3c58b78d83207a5816f4814ba7bf2 /src/libw32dll | |
| parent | 6163126d81baaac024bc55ddfc34941bc6d2778d (diff) | |
| parent | 3c175fd21df04c5c0afa160f81aea0c305f69dc5 (diff) | |
| download | xine-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 'src/libw32dll')
| -rw-r--r-- | src/libw32dll/qt_decoder.c | 2 | ||||
| -rw-r--r-- | src/libw32dll/w32codec.c | 3 | ||||
| -rw-r--r-- | src/libw32dll/w32codec.h | 3 | ||||
| -rw-r--r-- | src/libw32dll/wine/ldt_keeper.c | 3 |
4 files changed, 0 insertions, 11 deletions
diff --git a/src/libw32dll/qt_decoder.c b/src/libw32dll/qt_decoder.c index 57ddf79d7..3053b2b68 100644 --- a/src/libw32dll/qt_decoder.c +++ b/src/libw32dll/qt_decoder.c @@ -17,8 +17,6 @@ * along with this program; if not, write to the Free Software * 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 $ - * * quicktime video/audio decoder plugin, using win32 dlls * most of this code comes directly from MPlayer * authors: A'rpi and Sascha Sommer diff --git a/src/libw32dll/w32codec.c b/src/libw32dll/w32codec.c index 29a4f24eb..88790ebc7 100644 --- a/src/libw32dll/w32codec.c +++ b/src/libw32dll/w32codec.c @@ -17,12 +17,9 @@ * along with this program; if not, write to the Free Software * 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 $ - * * routines for using w32 codecs * DirectShow support by Miguel Freitas (Nov/2001) * DMO support (Dez/2002) - * */ #include <stdlib.h> diff --git a/src/libw32dll/w32codec.h b/src/libw32dll/w32codec.h index 552819ae1..1f02ba764 100644 --- a/src/libw32dll/w32codec.h +++ b/src/libw32dll/w32codec.h @@ -17,10 +17,7 @@ * along with this program; if not, write to the Free Software * 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 $ - * * routines for using w32 codecs - * */ #include "wine/msacm.h" diff --git a/src/libw32dll/wine/ldt_keeper.c b/src/libw32dll/wine/ldt_keeper.c index 7f7169b86..0446d8634 100644 --- a/src/libw32dll/wine/ldt_keeper.c +++ b/src/libw32dll/wine/ldt_keeper.c @@ -17,8 +17,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: ldt_keeper.c,v 1.16 2007/03/09 23:49:35 dgp85 Exp $ - * * * contents: * @@ -35,7 +33,6 @@ * Also, IMHO, that was slightly wrong. The TEB is supposed to be unique * per W32 thread. The current xine implementation will allocate different * TEBs for the audio and video codecs. - * */ |