diff options
Diffstat (limited to 'src')
321 files changed, 1053 insertions, 924 deletions
diff --git a/src/audio_out/audio_alsa_out.c b/src/audio_out/audio_alsa_out.c index 25f1df62f..e92bfbb3a 100644 --- a/src/audio_out/audio_alsa_out.c +++ b/src/audio_out/audio_alsa_out.c @@ -24,9 +24,6 @@ * for initial ALSA 0.9.x support. * adding MONO/STEREO/4CHANNEL/5CHANNEL/5.1CHANNEL analogue support. * (c) 2001 James Courtier-Dutton <James@superbug.demon.co.uk> - * - * - * $Id: audio_alsa_out.c,v 1.168 2007/02/25 22:33:25 miguelfreitas Exp $ */ #ifdef HAVE_CONFIG_H diff --git a/src/audio_out/audio_directx2_out.c b/src/audio_out/audio_directx2_out.c index eb4093229..d9688b647 100644 --- a/src/audio_out/audio_directx2_out.c +++ b/src/audio_out/audio_directx2_out.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: audio_directx2_out.c,v 1.9 2006/07/16 16:18:09 dsalt Exp $ - * * * xine audio output plugin using DirectX * diff --git a/src/audio_out/audio_directx_out.c b/src/audio_out/audio_directx_out.c index 89fb8f7e9..77e3e15b9 100755..100644 --- a/src/audio_out/audio_directx_out.c +++ b/src/audio_out/audio_directx_out.c @@ -19,8 +19,6 @@ * * audio_directx_out.c, direct sound audio output plugin for xine * by Matthew Grooms <elon@altavista.com> - * - * $Id: audio_directx_out.c,v 1.17 2006/09/21 15:01:08 valtri Exp $ */ /* diff --git a/src/audio_out/audio_esd_out.c b/src/audio_out/audio_esd_out.c index 4e0cbfbfa..4b209bea1 100644 --- a/src/audio_out/audio_esd_out.c +++ b/src/audio_out/audio_esd_out.c @@ -16,8 +16,6 @@ * You 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 - * - * $Id: audio_esd_out.c,v 1.35 2006/07/16 16:18:09 dsalt Exp $ */ #ifdef HAVE_CONFIG_H diff --git a/src/audio_out/audio_file_out.c b/src/audio_out/audio_file_out.c index c59b04bde..225d64d0e 100644 --- a/src/audio_out/audio_file_out.c +++ b/src/audio_out/audio_file_out.c @@ -16,8 +16,6 @@ * You 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 - * - * $Id: audio_file_out.c,v 1.8 2006/07/16 16:18:09 dsalt Exp $ */ #ifdef HAVE_CONFIG_H diff --git a/src/audio_out/audio_irixal_out.c b/src/audio_out/audio_irixal_out.c index 4375e33ca..1654cc1a7 100644 --- a/src/audio_out/audio_irixal_out.c +++ b/src/audio_out/audio_irixal_out.c @@ -16,8 +16,6 @@ * You 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 - * - * $Id: audio_irixal_out.c,v 1.16 2006/07/16 16:18:09 dsalt Exp $ */ #ifdef HAVE_CONFIG_H diff --git a/src/audio_out/audio_none_out.c b/src/audio_out/audio_none_out.c index 1a0c2d84b..a815d645a 100644 --- a/src/audio_out/audio_none_out.c +++ b/src/audio_out/audio_none_out.c @@ -16,8 +16,6 @@ * You 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 - * - * $Id: audio_none_out.c,v 1.11 2006/07/16 16:18:09 dsalt Exp $ */ #ifdef HAVE_CONFIG_H diff --git a/src/audio_out/audio_oss_out.c b/src/audio_out/audio_oss_out.c index f5f6f8153..a6e0fe494 100644 --- a/src/audio_out/audio_oss_out.c +++ b/src/audio_out/audio_oss_out.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: audio_oss_out.c,v 1.120 2007/03/17 06:59:31 dgp85 Exp $ - * * 20-8-2001 First implementation of Audio sync and Audio driver separation. * Copyright (C) 2001 James Courtier-Dutton James@superbug.demon.co.uk * @@ -34,7 +32,6 @@ * when dealing with audio_bytes instead of audio_frames. * * The number of samples passed to/from the audio driver is also sent in units of audio_frames. - * */ #ifdef HAVE_CONFIG_H diff --git a/src/audio_out/audio_pulse_out.c b/src/audio_out/audio_pulse_out.c index 86468a6d1..7baaeaf7f 100644 --- a/src/audio_out/audio_pulse_out.c +++ b/src/audio_out/audio_pulse_out.c @@ -17,15 +17,12 @@ * along with this program; if not, write to the Free Software * 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 $ - * * ao plugin for pulseaudio (rename of polypaudio): * http://0pointer.de/lennart/projects/pulsaudio/ * * originally written for polypaudio simple api. Lennart then suggested * using the async api for better control (such as volume), therefore, a lot * of this code comes from Lennart's patch to mplayer. - * */ #ifdef HAVE_CONFIG_H diff --git a/src/audio_out/audio_sun_out.c b/src/audio_out/audio_sun_out.c index 2c92b5fcd..838230dbe 100644 --- a/src/audio_out/audio_sun_out.c +++ b/src/audio_out/audio_sun_out.c @@ -16,8 +16,6 @@ * You 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 - * - * $Id: audio_sun_out.c,v 1.47 2007/03/10 00:55:14 dgp85 Exp $ */ #ifdef HAVE_CONFIG_H diff --git a/src/combined/nsf_combined.c b/src/combined/nsf_combined.c index 5cb463323..0f71a287d 100644 --- a/src/combined/nsf_combined.c +++ b/src/combined/nsf_combined.c @@ -16,8 +16,6 @@ * You 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 - * - * $Id: combined_wavpack.c,v 1.3 2007/03/17 07:34:02 dgp85 Exp $ */ #include "xine_internal.h" diff --git a/src/combined/nsf_decoder.c b/src/combined/nsf_decoder.c index f2cf7ff8b..a809ff9cc 100644 --- a/src/combined/nsf_decoder.c +++ b/src/combined/nsf_decoder.c @@ -19,8 +19,6 @@ * * NSF Audio "Decoder" using the Nosefart NSF engine by Matt Conte * http://www.baisoku.org/ - * - * $Id: nsf.c,v 1.13 2006/09/25 23:56:31 dgp85 Exp $ */ #include <stdio.h> diff --git a/src/combined/nsf_demuxer.c b/src/combined/nsf_demuxer.c index 5f2be8899..95897e3ac 100644 --- a/src/combined/nsf_demuxer.c +++ b/src/combined/nsf_demuxer.c @@ -29,8 +29,6 @@ * * For more information regarding the NSF format, visit: * http://www.tripoint.org/kevtris/nes/nsfspec.txt - * - * $Id: demux_nsf.c,v 1.24 2007/03/29 17:03:06 dgp85 Exp $ */ #ifdef HAVE_CONFIG_H diff --git a/src/combined/wavpack_combined.c b/src/combined/wavpack_combined.c index 020488a90..e7a1bc76a 100644 --- a/src/combined/wavpack_combined.c +++ b/src/combined/wavpack_combined.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * xine interface to libwavpack by Diego Pettenò <flameeyes@gmail.com> - * - * $Id: combined_wavpack.c,v 1.3 2007/03/17 07:34:02 dgp85 Exp $ */ #include "xine_internal.h" diff --git a/src/combined/wavpack_combined.h b/src/combined/wavpack_combined.h index a591d26a0..264609bf2 100644 --- a/src/combined/wavpack_combined.h +++ b/src/combined/wavpack_combined.h @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * xine interface to libwavpack by Diego Pettenò <flameeyes@gmail.com> - * - * $Id: combined_wavpack.h,v 1.3 2007/03/17 07:34:02 dgp85 Exp $ */ #include "os_types.h" diff --git a/src/combined/wavpack_decoder.c b/src/combined/wavpack_decoder.c index e174bd809..2bd0339d8 100644 --- a/src/combined/wavpack_decoder.c +++ b/src/combined/wavpack_decoder.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * xine interface to libwavpack by Diego Pettenò <flameeyes@gmail.com> - * - * $Id: decoder_wavpack.c,v 1.14 2007/03/29 19:45:33 dgp85 Exp $ */ #ifdef HAVE_CONFIG_H diff --git a/src/combined/wavpack_demuxer.c b/src/combined/wavpack_demuxer.c index 597a7a6bc..4b8300d44 100644 --- a/src/combined/wavpack_demuxer.c +++ b/src/combined/wavpack_demuxer.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * xine interface to libwavpack by Diego Pettenò <flameeyes@gmail.com> - * - * $Id: demux_wavpack.c,v 1.11 2007/03/17 07:34:02 dgp85 Exp $ */ #ifdef HAVE_CONFIG_H diff --git a/src/combined/xine_ogg_demuxer.c b/src/combined/xine_ogg_demuxer.c index 36971507b..973f02a47 100644 --- a/src/combined/xine_ogg_demuxer.c +++ b/src/combined/xine_ogg_demuxer.c @@ -19,10 +19,7 @@ */ /* - * $Id: demux_ogg.c,v 1.177 2007/03/29 19:38:51 dgp85 Exp $ - * * demultiplexer for ogg streams - * */ /* 2003.02.09 (dilb) update of the handling for audio/video infos for strongarm cpus. */ diff --git a/src/combined/xine_speex_decoder.c b/src/combined/xine_speex_decoder.c index fe004faa8..fa1ede0f2 100644 --- a/src/combined/xine_speex_decoder.c +++ b/src/combined/xine_speex_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: xine_decoder.c,v 1.22 2007/01/19 01:48:05 dgp85 Exp $ - * * (ogg/)speex audio decoder plugin (libspeex wrapper) for xine */ diff --git a/src/combined/xine_theora_decoder.c b/src/combined/xine_theora_decoder.c index 0959a5411..9fd3d6416 100644 --- a/src/combined/xine_theora_decoder.c +++ b/src/combined/xine_theora_decoder.c @@ -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: xine_decoder.c,v 1.26 2006/07/10 22:08:30 dgp85 Exp $ - * * xine decoder plugin using libtheora - * */ #ifdef HAVE_CONFIG_H diff --git a/src/combined/xine_vorbis_decoder.c b/src/combined/xine_vorbis_decoder.c index 394f76048..ef6d94d06 100644 --- a/src/combined/xine_vorbis_decoder.c +++ b/src/combined/xine_vorbis_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: xine_decoder.c,v 1.48 2006/12/04 13:59:38 dgp85 Exp $ - * * (ogg/)vorbis audio decoder plugin (libvorbis wrapper) for xine */ diff --git a/src/demuxers/Makefile.am b/src/demuxers/Makefile.am index ac132463b..ba3041d5d 100644 --- a/src/demuxers/Makefile.am +++ b/src/demuxers/Makefile.am @@ -52,7 +52,8 @@ xineplug_LTLIBRARIES = \ xineplug_dmx_nsv.la \ xineplug_dmx_matroska.la \ xineplug_dmx_iff.la \ - xineplug_dmx_flv.la + xineplug_dmx_flv.la \ + xineplug_dmx_playlist.la xineplug_dmx_avi_la_SOURCES = demux_avi.c xineplug_dmx_avi_la_LIBADD = $(XINE_LIB) $(LTLIBINTL) @@ -141,3 +142,6 @@ xineplug_dmx_iff_la_LIBADD = $(XINE_LIB) $(LTLIBINTL) xineplug_dmx_flv_la_SOURCES = demux_flv.c xineplug_dmx_flv_la_LIBADD = $(XINE_LIB) $(LTLIBINTL) + +xineplug_dmx_playlist_la_SOURCES = demux_playlist.c +xineplug_dmx_playlist_la_LIBADD = $(XINE_LIB) $(LTLIBINTL) diff --git a/src/demuxers/asfheader.h b/src/demuxers/asfheader.h index 8126b129b..4bd13ab3f 100644 --- a/src/demuxers/asfheader.h +++ b/src/demuxers/asfheader.h @@ -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: asfheader.h,v 1.8 2006/09/12 21:24:19 valtri Exp $
- *
* demultiplexer for asf streams
*
* based on ffmpeg's
diff --git a/src/demuxers/demux.h b/src/demuxers/demux.h index abd72aadd..81907cfcf 100644 --- a/src/demuxers/demux.h +++ b/src/demuxers/demux.h @@ -16,8 +16,6 @@ * You 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 - * - * $Id: demux.h,v 1.40 2007/01/19 00:26:39 dgp85 Exp $ */ #ifndef HAVE_DEMUX_H diff --git a/src/demuxers/demux_4xm.c b/src/demuxers/demux_4xm.c index 4bdaa301a..24aee1ac4 100644 --- a/src/demuxers/demux_4xm.c +++ b/src/demuxers/demux_4xm.c @@ -22,8 +22,6 @@ * 4X Technologies (.4xm) File Demuxer by Mike Melanson (melanson@pcisys.net) * For more information on the 4xm file format, visit: * http://www.pcisys.net/~melanson/codecs/ - * - * $Id: demux_4xm.c,v 1.16 2007/01/19 00:26:39 dgp85 Exp $ */ #ifdef HAVE_CONFIG_H diff --git a/src/demuxers/demux_aac.c b/src/demuxers/demux_aac.c index ad663f052..d80413f83 100644 --- a/src/demuxers/demux_aac.c +++ b/src/demuxers/demux_aac.c @@ -20,8 +20,6 @@ * Raw AAC File Demuxer by Mike Melanson (melanson@pcisys.net) * This demuxer detects ADIF and ADTS headers in AAC files. * Then it shovels buffer-sized chunks over to the AAC decoder. - * - * $Id: demux_aac.c,v 1.17 2007/03/03 01:41:16 dgp85 Exp $ */ #ifdef HAVE_CONFIG_H diff --git a/src/demuxers/demux_ac3.c b/src/demuxers/demux_ac3.c index 651a8af9d..c0fae275b 100644 --- a/src/demuxers/demux_ac3.c +++ b/src/demuxers/demux_ac3.c @@ -22,8 +22,6 @@ * AC3 File Demuxer by Mike Melanson (melanson@pcisys.net) * This demuxer detects raw AC3 data in a file and shovels AC3 data * directly to the AC3 decoder. - * - * $Id: demux_ac3.c,v 1.21 2007/03/19 16:42:32 dgp85 Exp $ */ #ifdef HAVE_CONFIG_H diff --git a/src/demuxers/demux_aiff.c b/src/demuxers/demux_aiff.c index 40c8e7457..7fcaea70e 100644 --- a/src/demuxers/demux_aiff.c +++ b/src/demuxers/demux_aiff.c @@ -20,9 +20,6 @@ /* * AIFF File Demuxer by Mike Melanson (melanson@pcisys.net) - * - * $Id: demux_aiff.c,v 1.41 2007/01/19 00:26:40 dgp85 Exp $ - * */ #ifdef HAVE_CONFIG_H diff --git a/src/demuxers/demux_asf.c b/src/demuxers/demux_asf.c index 4b6672cb0..742fa6541 100644 --- a/src/demuxers/demux_asf.c +++ b/src/demuxers/demux_asf.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: demux_asf.c,v 1.194 2007/03/09 23:18:19 dgp85 Exp $ - * * demultiplexer for asf streams * * based on ffmpeg's @@ -1538,108 +1536,90 @@ static int demux_asf_parse_asx_references( demux_asf_t *this) { ENTRYREF, MOREINFO, PARAM, REPEAT, TITLE */ - const char *version = xml_parser_get_property (xml_tree, "VERSION"); + const char *base_href = NULL; - if (version) { - int version_major, version_minor = 0; + for (asx_entry = xml_tree->child; asx_entry; asx_entry = asx_entry->next) + { + const char *ref_base_href = base_href; - if((sscanf (version, "%d.%d", &version_major, &version_minor) == 2 || - sscanf (version, "%d", &version_major) == 1) && - (version_major == 3 && version_minor == 0)) + if (!strcasecmp (asx_entry->name, "ENTRY")) { - const char *base_href = NULL; + /* Attributes: CLIENTSKIP, SKIPIFREF + * Child elements: ABSTRACT, AUTHOR, BASE, COPYRIGHT, DURATION, + ENDMARKER, MOREINFO, PARAM, REF, STARTMARKER, + STARTTIME, TITLE + */ + const char *href = NULL; + const char *title = NULL; + uint32_t start_time = (uint32_t)-1; + uint32_t duration = (uint32_t)-1; - for (asx_entry = xml_tree->child; asx_entry; asx_entry = asx_entry->next) + for (asx_ref = asx_entry->child; asx_ref; asx_ref = asx_ref->next) { - const char *ref_base_href = base_href; - - if (!strcasecmp (asx_entry->name, "ENTRY")) + if (!strcasecmp(asx_ref->name, "REF")) { - /* Attributes: CLIENTSKIP, SKIPIFREF - * Child elements: ABSTRACT, AUTHOR, BASE, COPYRIGHT, DURATION, - ENDMARKER, MOREINFO, PARAM, REF, STARTMARKER, - STARTTIME, TITLE + xml_node_t *asx_sub; + /* Attributes: HREF + * Child elements: DURATION, ENDMARKER, STARTMARKER, STARTTIME + */ + + /* FIXME: multiple REFs => alternative streams + * (and per-ref start times and durations?). + * Just the one title, though. */ - const char *href = NULL; - const char *title = NULL; - uint32_t start_time = (uint32_t)-1; - uint32_t duration = (uint32_t)-1; + href = xml_parser_get_property (asx_ref, "HREF"); - for (asx_ref = asx_entry->child; asx_ref; asx_ref = asx_ref->next) + for (asx_sub = asx_ref->child; asx_sub; asx_sub = asx_sub->next) { - if (!strcasecmp(asx_ref->name, "REF")) - { - xml_node_t *asx_sub; - /* Attributes: HREF - * Child elements: DURATION, ENDMARKER, STARTMARKER, STARTTIME - */ - - /* FIXME: multiple REFs => alternative streams - * (and per-ref start times and durations?). - * Just the one title, though. - */ - href = xml_parser_get_property (asx_ref, "HREF"); - - for (asx_sub = asx_ref->child; asx_sub; asx_sub = asx_sub->next) - { - if (!strcasecmp (asx_sub->name, "STARTTIME")) - start_time = asx_get_time_value (asx_sub); - else if (!strcasecmp (asx_sub->name, "DURATION")) - duration = asx_get_time_value (asx_sub); - } - } - - else if (!strcasecmp (asx_ref->name, "TITLE")) - { - if (!title) - title = asx_ref->data; - } - - else if (!strcasecmp (asx_ref->name, "STARTTIME")) - { - if (start_time == (uint32_t)-1) - start_time = asx_get_time_value (asx_ref); - } - - else if (!strcasecmp (asx_ref->name, "DURATION")) - { - if (duration == (uint32_t)-1) - duration = asx_get_time_value (asx_ref); - } - - else if (!strcasecmp (asx_ref->name, "BASE")) - /* Attributes: HREF */ - ref_base_href = xml_parser_get_property (asx_entry, "HREF"); + if (!strcasecmp (asx_sub->name, "STARTTIME")) + start_time = asx_get_time_value (asx_sub); + else if (!strcasecmp (asx_sub->name, "DURATION")) + duration = asx_get_time_value (asx_sub); } + } - /* FIXME: prepend ref_base_href to href */ - if (href && *href) - _x_demux_send_mrl_reference (this->stream, 0, href, title, - start_time == (uint32_t)-1 ? 0 : start_time, - duration == (uint32_t)-1 ? -1 : duration); + else if (!strcasecmp (asx_ref->name, "TITLE")) + { + if (!title) + title = asx_ref->data; } - else if (!strcasecmp (asx_entry->name, "ENTRYREF")) + else if (!strcasecmp (asx_ref->name, "STARTTIME")) { - /* Attributes: HREF, CLIENTBIND */ - const char *href = xml_parser_get_property (asx_entry, "HREF"); - if (href && *href) - _x_demux_send_mrl_reference (this->stream, 0, href, NULL, 0, -1); + if (start_time == (uint32_t)-1) + start_time = asx_get_time_value (asx_ref); } - else if (!strcasecmp (asx_entry->name, "BASE")) + else if (!strcasecmp (asx_ref->name, "DURATION")) + { + if (duration == (uint32_t)-1) + duration = asx_get_time_value (asx_ref); + } + + else if (!strcasecmp (asx_ref->name, "BASE")) /* Attributes: HREF */ - base_href = xml_parser_get_property (asx_entry, "HREF"); + ref_base_href = xml_parser_get_property (asx_entry, "HREF"); } + + /* FIXME: prepend ref_base_href to href */ + if (href && *href) + _x_demux_send_mrl_reference (this->stream, 0, href, title, + start_time == (uint32_t)-1 ? 0 : start_time, + duration == (uint32_t)-1 ? -1 : duration); } - else - xprintf(this->stream->xine, XINE_VERBOSITY_LOG, - _("demux_asf: Wrong ASX version: %s\n"), version); - + + else if (!strcasecmp (asx_entry->name, "ENTRYREF")) + { + /* Attributes: HREF, CLIENTBIND */ + const char *href = xml_parser_get_property (asx_entry, "HREF"); + if (href && *href) + _x_demux_send_mrl_reference (this->stream, 0, href, NULL, 0, -1); + } + + else if (!strcasecmp (asx_entry->name, "BASE")) + /* Attributes: HREF */ + base_href = xml_parser_get_property (asx_entry, "HREF"); } - else - xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, - "demux_asf: Unable to find VERSION tag from ASX.\n"); } else xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, diff --git a/src/demuxers/demux_aud.c b/src/demuxers/demux_aud.c index 89ca8f061..6223a4068 100644 --- a/src/demuxers/demux_aud.c +++ b/src/demuxers/demux_aud.c @@ -33,8 +33,6 @@ * initialized to 0 at the start of the file and maintained throughout the * data. This makes seeking conceptually impossible. Upshot: Random * seeking is not supported. - * - * $Id: demux_aud.c,v 1.20 2007/01/19 00:26:40 dgp85 Exp $ */ #ifdef HAVE_CONFIG_H diff --git a/src/demuxers/demux_avi.c b/src/demuxers/demux_avi.c index 614c84091..544c19d76 100644 --- a/src/demuxers/demux_avi.c +++ b/src/demuxers/demux_avi.c @@ -19,8 +19,6 @@ */ /* - * $Id: demux_avi.c,v 1.232 2007/03/29 19:24:18 dgp85 Exp $ - * * demultiplexer for avi streams * * part of the code is taken from @@ -46,7 +44,6 @@ * expect to find the next A/V frame. We periodically check if we can * read data from the file at that offset. If we can, we append index * data for as many frames as we can read at the time. - * */ /* @@ -55,7 +52,6 @@ * Transcode's and xine's avi code comes from the same source and * still has a very similar architecture, so it wasn't much effort to * port it from transcode to xine. - * */ #ifdef HAVE_CONFIG_H diff --git a/src/demuxers/demux_cdda.c b/src/demuxers/demux_cdda.c index b52e23ac5..0f34a7cec 100644 --- a/src/demuxers/demux_cdda.c +++ b/src/demuxers/demux_cdda.c @@ -23,8 +23,6 @@ * All this demuxer does is read raw CD frames and shovel them to the * linear PCM "decoder" (which in turn sends them directly to the audio * output target; this is a really fancy CD-playing architecture). - * - * $Id: demux_cdda.c,v 1.20 2007/01/19 00:26:40 dgp85 Exp $ */ #ifdef HAVE_CONFIG_H diff --git a/src/demuxers/demux_dts.c b/src/demuxers/demux_dts.c index 078c84ea1..7c9b47fcd 100644 --- a/src/demuxers/demux_dts.c +++ b/src/demuxers/demux_dts.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * Raw DTS Demuxer by James Stembridge (jstembridge@gmail.com) - * - * $Id: demux_dts.c,v 1.8 2007/03/19 16:42:32 dgp85 Exp $ */ #ifdef HAVE_CONFIG_H diff --git a/src/demuxers/demux_eawve.c b/src/demuxers/demux_eawve.c index 4076fbadc..2359d3baf 100644 --- a/src/demuxers/demux_eawve.c +++ b/src/demuxers/demux_eawve.c @@ -19,8 +19,6 @@ */ /* - * $Id: demux_eawve.c,v 1.29 2007/01/19 00:26:40 dgp85 Exp $ - * * demux_eawve.c, Demuxer plugin for Electronic Arts' WVE file format * * written and currently maintained by Robin Kay <komadori@myrealbox.com> diff --git a/src/demuxers/demux_elem.c b/src/demuxers/demux_elem.c index c0f34240a..d0a821504 100644 --- a/src/demuxers/demux_elem.c +++ b/src/demuxers/demux_elem.c @@ -19,8 +19,6 @@ */ /* - * $Id: demux_elem.c,v 1.91 2007/02/20 00:34:55 dgp85 Exp $ - * * demultiplexer for elementary mpeg streams */ diff --git a/src/demuxers/demux_film.c b/src/demuxers/demux_film.c index 6a639ae22..26a7a9713 100644 --- a/src/demuxers/demux_film.c +++ b/src/demuxers/demux_film.c @@ -20,8 +20,6 @@ * FILM (CPK) File Demuxer by Mike Melanson (melanson@pcisys.net) * For more information on the FILM file format, visit: * http://www.pcisys.net/~melanson/codecs/ - * - * $Id: demux_film.c,v 1.82 2007/01/19 00:26:40 dgp85 Exp $ */ #ifdef HAVE_CONFIG_H diff --git a/src/demuxers/demux_flac.c b/src/demuxers/demux_flac.c index 502c8772c..9bf78ff38 100644 --- a/src/demuxers/demux_flac.c +++ b/src/demuxers/demux_flac.c @@ -22,8 +22,6 @@ * FLAC File Demuxer by Mike Melanson (melanson@pcisys.net) * For more information on the FLAC file format, visit: * http://flac.sourceforge.net/ - * - * $Id: demux_flac.c,v 1.17 2007/03/29 16:52:23 dgp85 Exp $ */ #ifdef HAVE_CONFIG_H diff --git a/src/demuxers/demux_fli.c b/src/demuxers/demux_fli.c index 2a68bcfc8..99843a68c 100644 --- a/src/demuxers/demux_fli.c +++ b/src/demuxers/demux_fli.c @@ -23,8 +23,6 @@ * For information on the FLI format, as well as various traps to * avoid while programming a FLI decoder, visit: * http://www.pcisys.net/~melanson/codecs/ - * - * $Id: demux_fli.c,v 1.60 2007/01/19 00:26:40 dgp85 Exp $ */ #ifdef HAVE_CONFIG_H diff --git a/src/demuxers/demux_flv.c b/src/demuxers/demux_flv.c index 940d651e2..aa9fae13c 100644 --- a/src/demuxers/demux_flv.c +++ b/src/demuxers/demux_flv.c @@ -25,8 +25,6 @@ * * For more information on the FLV file format, visit: * http://download.macromedia.com/pub/flash/flash_file_format_specification.pdf - * - * $Id: demux_flv.c,v 1.21 2007/03/17 11:29:43 klan Exp $ */ #ifdef HAVE_CONFIG_H diff --git a/src/demuxers/demux_idcin.c b/src/demuxers/demux_idcin.c index 8c520150c..11cb8cb9e 100644 --- a/src/demuxers/demux_idcin.c +++ b/src/demuxers/demux_idcin.c @@ -64,8 +64,6 @@ * - scan through all 768 palette bytes * - if any bytes exceed 63, do not shift the bytes at all before * transmitting them to the video decoder - * - * $Id: demux_idcin.c,v 1.55 2007/02/20 00:34:55 dgp85 Exp $ */ #ifdef HAVE_CONFIG_H diff --git a/src/demuxers/demux_iff.c b/src/demuxers/demux_iff.c index cc3a68507..d914405db 100644 --- a/src/demuxers/demux_iff.c +++ b/src/demuxers/demux_iff.c @@ -35,8 +35,6 @@ * - simple pictures work, nothing more (most work is done in bitmap-decoder) * * ANIM (Animations) * - Animation works fine, without seeking. - * - * $Id: demux_iff.c,v 1.19 2007/01/19 00:26:40 dgp85 Exp $ */ #ifdef HAVE_CONFIG_H diff --git a/src/demuxers/demux_image.c b/src/demuxers/demux_image.c index 6c05ed301..9f53e4173 100644 --- a/src/demuxers/demux_image.c +++ b/src/demuxers/demux_image.c @@ -19,8 +19,6 @@ */ /* - * $Id: demux_image.c,v 1.26 2007/01/19 00:26:40 dgp85 Exp $ - * * image dummy demultiplexer */ diff --git a/src/demuxers/demux_ipmovie.c b/src/demuxers/demux_ipmovie.c index 9d284ff66..cd21896c0 100644 --- a/src/demuxers/demux_ipmovie.c +++ b/src/demuxers/demux_ipmovie.c @@ -22,8 +22,6 @@ * Interplay MVE File Demuxer by Mike Melanson (melanson@pcisys.net) * For more information regarding the Interplay MVE file format, visit: * http://www.pcisys.net/~melanson/codecs/ - * - * $Id: demux_ipmovie.c,v 1.27 2007/02/20 00:34:55 dgp85 Exp $ */ #ifdef HAVE_CONFIG_H diff --git a/src/demuxers/demux_matroska.c b/src/demuxers/demux_matroska.c index 9609a75e5..0169651a0 100644 --- a/src/demuxers/demux_matroska.c +++ b/src/demuxers/demux_matroska.c @@ -17,15 +17,12 @@ * along with this program; if not, write to the Free Software * 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 $ - * * demultiplexer for matroska streams * * TODO: * more decoders init * metadata * non seekable input plugins support - * */ #ifdef HAVE_CONFIG_H diff --git a/src/demuxers/demux_mng.c b/src/demuxers/demux_mng.c index 373cedf80..12da8ca86 100644 --- a/src/demuxers/demux_mng.c +++ b/src/demuxers/demux_mng.c @@ -19,8 +19,6 @@ */ /* - * $Id: demux_mng.c,v 1.29 2007/01/19 00:26:40 dgp85 Exp $ - * * demux_mng.c, Demuxer plugin for Multiple-image Network Graphics format * * written and currently maintained by Robin Kay <komadori@myrealbox.com> diff --git a/src/demuxers/demux_mpc.c b/src/demuxers/demux_mpc.c index 2718da54c..346f0c2e6 100644 --- a/src/demuxers/demux_mpc.c +++ b/src/demuxers/demux_mpc.c @@ -23,8 +23,6 @@ * ID3 tag reading * APE tag reading * Seeking?? - * - * $Id: demux_mpc.c,v 1.5 2007/01/19 00:26:40 dgp85 Exp $ */ #ifdef HAVE_CONFIG_H diff --git a/src/demuxers/demux_mpeg.c b/src/demuxers/demux_mpeg.c index dfe9b7798..4419f8404 100644 --- a/src/demuxers/demux_mpeg.c +++ b/src/demuxers/demux_mpeg.c @@ -19,8 +19,6 @@ */ /* - * $Id: demux_mpeg.c,v 1.152 2007/02/20 00:34:55 dgp85 Exp $ - * * demultiplexer for mpeg 1/2 program streams * reads streams of variable blocksizes */ diff --git a/src/demuxers/demux_mpeg_block.c b/src/demuxers/demux_mpeg_block.c index e9023b7c5..32638129d 100644 --- a/src/demuxers/demux_mpeg_block.c +++ b/src/demuxers/demux_mpeg_block.c @@ -17,11 +17,8 @@ * along with this program; if not, write to the Free Software * 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 $ - * * demultiplexer for mpeg 1/2 program streams * used with fixed blocksize devices (like dvd/vcd) - * */ #ifdef HAVE_CONFIG_H diff --git a/src/demuxers/demux_mpeg_pes.c b/src/demuxers/demux_mpeg_pes.c index 0cab7e671..423da5e24 100644 --- a/src/demuxers/demux_mpeg_pes.c +++ b/src/demuxers/demux_mpeg_pes.c @@ -17,15 +17,12 @@ * along with this program; if not, write to the Free Software * 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 $ - * * demultiplexer for mpeg 2 PES (Packetized Elementary Streams) * reads streams of variable blocksizes * * 1-7-2003 New implementation of mpeg 2 PES demuxers. * (c) 2003 James Courtier-Dutton James@superbug.demon.co.uk * This code might also decode normal MPG files. - * */ #ifdef HAVE_CONFIG_H diff --git a/src/demuxers/demux_mpgaudio.c b/src/demuxers/demux_mpgaudio.c index a45cb6367..9c997c9f5 100644 --- a/src/demuxers/demux_mpgaudio.c +++ b/src/demuxers/demux_mpgaudio.c @@ -17,13 +17,10 @@ * along with this program; if not, write to the Free Software * 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 $ - * * demultiplexer for mpeg audio (i.e. mp3) streams * * mp3 file structure: * [id3v2][Xing|Vbri] Frame1 Frame2 Frame3...FrameX [Lyrics][id3v2][id3v1] - * */ #ifdef HAVE_CONFIG_H diff --git a/src/demuxers/demux_nsv.c b/src/demuxers/demux_nsv.c index 4abaf4058..44bb18c79 100644 --- a/src/demuxers/demux_nsv.c +++ b/src/demuxers/demux_nsv.c @@ -22,8 +22,6 @@ * Nullsoft Video (NSV) file demuxer by Mike Melanson (melanson@pcisys.net) * For more information regarding the NSV file format, visit: * http://www.pcisys.net/~melanson/codecs/ - * - * $Id: demux_nsv.c,v 1.25 2007/01/19 00:26:40 dgp85 Exp $ */ #ifdef HAVE_CONFIG_H diff --git a/src/demuxers/demux_playlist.c b/src/demuxers/demux_playlist.c new file mode 100644 index 000000000..bbe6998e6 --- /dev/null +++ b/src/demuxers/demux_playlist.c @@ -0,0 +1,746 @@ +/* + * Copyright (C) 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * + * + * Playlist parser/demuxer by + * Claudio Ciccani (klan@users.sourceforge.net) + * + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include <stdio.h> +#include <fcntl.h> +#include <unistd.h> +#include <string.h> +#include <stdlib.h> +#include <ctype.h> + +#define LOG_MODULE "demux_playlist" +#define LOG_VERBOSE +/* +#define LOG +*/ + +#include "xine_internal.h" +#include "xineutils.h" +#include "bswap.h" +#include "demux.h" + +typedef enum { + XINE_PLT_NONE = 0, + XINE_PLT_REF = ME_FOURCC('R','E','F',0), + XINE_PLT_M3U = ME_FOURCC('M','3','U',0), + XINE_PLT_RAM = ME_FOURCC('R','A','M',0), + XINE_PLT_PLS = ME_FOURCC('P','L','S',0), + XINE_PLT_ASX = ME_FOURCC('A','S','X',0), + XINE_PLT_SMI = ME_FOURCC('S','M','I',0), + XINE_PLT_QTL = ME_FOURCC('Q','T','L',0), + XINE_PLT_XSPF = ME_FOURCC('X','S','P',0), + XINE_PLT_RSS = ME_FOURCC('R','S','S',0) +} playlist_t; + +typedef struct { + demux_plugin_t demux_plugin; + + xine_t *xine; + xine_stream_t *stream; + input_plugin_t *input; + + playlist_t playlist; + + int status; +} demux_playlist_t; + +typedef struct { + demux_class_t demux_class; +} demux_playlist_class_t; + + +static playlist_t detect_by_extension (input_plugin_t *input) { + char *ext; + + ext = strrchr (input->get_mrl (input), '.'); + if (!ext) + return XINE_PLT_NONE; + + if (!strcasecmp (ext, ".m3u")) + return XINE_PLT_M3U; + if (!strcasecmp (ext, ".ram")) + return XINE_PLT_RAM; + if (!strcasecmp (ext, ".pls")) + return XINE_PLT_PLS; + if (!strcasecmp (ext, ".wax") || + !strcasecmp (ext, ".wvx") || + !strcasecmp (ext, ".asx")) + return XINE_PLT_ASX; + if (!strcasecmp (ext, ".smi") || + !strcasecmp (ext, ".smil")) + return XINE_PLT_SMI; + if (!strcasecmp (ext, ".qtl")) + return XINE_PLT_QTL; + if (!strcasecmp (ext, ".xspf")) + return XINE_PLT_XSPF; + if (!strcasecmp (ext, ".rss")) + return XINE_PLT_RSS; + + return XINE_PLT_NONE; +} + +static playlist_t detect_by_content (input_plugin_t *input) { + char buf[256], *tmp; + int len; + + len = _x_demux_read_header (input, buf, sizeof(buf)-1); + if (len <= 0) + return XINE_PLT_NONE; + buf[len] = '\0'; + + tmp = buf; + while (*tmp && isspace(*tmp)) + tmp++; + + if (!strncmp (tmp, "[Reference]", 11) || + !strncmp (tmp, "Ref1=", 5)) + return XINE_PLT_REF; + if (!strncmp (tmp, "#EXTM3U", 7)) + return XINE_PLT_M3U; + if (!strncmp (tmp, "file://", 7) || + !strncmp (tmp, "http://", 7) || + !strncmp (tmp, "rtsp://", 7) || + !strncmp (tmp, "pnm://", 6)) + return XINE_PLT_RAM; + if (!strncmp (tmp, "[Playlist]", 10 )) + return XINE_PLT_PLS; + if (!strncasecmp (tmp, "<ASX", 4)) + return XINE_PLT_ASX; + if (!strncmp (tmp, "<smil", 5)) + return XINE_PLT_SMI; + if (!strncmp (tmp, "<?quicktime", 11)) + return XINE_PLT_QTL; + if (!strncmp (tmp, "<playlist", 9)) + return XINE_PLT_XSPF; + if (!strncmp (tmp, "<rss", 4)) + return XINE_PLT_RSS; + + if (!strncmp (tmp, "<?xml", 5)) { + tmp += 5; + while ((tmp = strchr (tmp, '<'))) { + if (!strncasecmp (tmp, "<ASX", 4)) + return XINE_PLT_ASX; + if (!strncmp (tmp, "<smil", 5)) + return XINE_PLT_SMI; + if (!strncmp (tmp, "<?quicktime", 11)) + return XINE_PLT_QTL; + if (!strncmp (tmp, "<playlist", 9)) + return XINE_PLT_XSPF; + if (!strncmp (tmp, "<rss", 4)) + return XINE_PLT_RSS; + tmp++; + } + } + + return XINE_PLT_NONE; +} + +static char* trim (char *s) { + char *e; + + while (*s && isspace(*s)) + s++; + + e = s + strlen(s) - 1; + while (e > s && isspace(*e)) + *e-- = '\0'; + + return s; +} + +static int parse_time (const char *s) { + int t = 0; + int i; + + if (!s) + return 0; + + if (!strncmp (s, "npt=", 4)) + s += 4; + else if (!strncmp (s, "smpte=", 6)) + s += 6; + + for (i = 0; i < 3; i++) { + t *= 60; + t += atoi(s); + s = strchr (s, ':'); + if (!s) + break; + s++; + } + + return t*1000; +} + +static void parse_ref (demux_playlist_t *this, char *data, int length) { + char *src = data; + char *end; + int alt = 0; + + while (src && *src) { + end = strchr (src, '\n'); + if (end) + *end = '\0'; + + src = trim (src); + if (!strncmp (src, "Ref", 3)) { + src = strchr (src, '='); + if (src && *(src+1)) { + lprintf ("mrl:'%s'\n", src); + _x_demux_send_mrl_reference (this->stream, alt++, src+1, NULL, 0, 0); + } + } + + src = end; + if (src) + src++; + } +} + +static void parse_m3u (demux_playlist_t *this, char *data, int length) { + char *src = data; + char *end; + char *title = NULL; + + while (src && *src) { + end = strchr (src, '\n'); + if (end) + *end = '\0'; + + src = trim (src); + if (*src == '#') { + if (!strncmp (src+1, "EXTINF:", 7)) { + title = strchr (src+8, ','); + if (title) + title++; + } + } + else if (*src) { + lprintf ("mrl:'%s'\n", src); + _x_demux_send_mrl_reference (this->stream, 0, src, title, 0, 0); + } + + src = end; + if (src) + src++; + } +} + +static void parse_ram (demux_playlist_t *this, char *data, int length) { + char *src = data; + char *end; + + while (src && *src) { + end = strchr (src, '\n'); + if (end) + *end = '\0'; + + src = trim (src); + if (!strcmp (src, "--stop--")) + break; + + if (*src && *src != '#') { + char *title = NULL; + + if (!strncmp (src, "rtsp://", 7) || !strncmp (src, "pnm://", 7)) { + char *tmp = strrchr (src, '?'); + if (tmp) { + *tmp = '\0'; + title = strstr (tmp+1, "title="); + if (title) { + title += 6; + tmp = strchr (title, '&'); + if (tmp) + *tmp = '\0'; + } + } + } + + lprintf ("mrl:'%s'\n", src); + _x_demux_send_mrl_reference (this->stream, 0, src, title, 0, 0); + } + + src = end; + if (src) + src++; + } +} + +static void parse_pls (demux_playlist_t *this, char *data, int length) { + char *src = data; + char *end; + + while (src && *src) { + end = strchr (src, '\n'); + if (end) + *end = '\0'; + + src = trim (src); + if (!strncmp (src, "File", 4)) { + src = strchr (src+4, '='); + if (src && *(src+1)) { + lprintf ("mrl:'%s'\n", src+1); + _x_demux_send_mrl_reference (this->stream, 0, src+1, NULL, 0, 0); + } + } + + src = end; + if (src) + src++; + } +} + +static void parse_asx (demux_playlist_t *this, char *data, int length) { + xml_node_t *root, *node, *tmp; + int is_asx = 0; + + xml_parser_init (data, length, XML_PARSER_CASE_INSENSITIVE); + + if (xml_parser_build_tree (&root) >= 0) { + if (!strcasecmp (root->name, "asx")) { + is_asx = 1; + + for (node = root->child; node; node = node->next) { + if (!strcasecmp (node->name, "entry")) { + const char *title = NULL; + const char *src = NULL; + const char *start = NULL; + const char *duration = NULL; + + for (tmp = node->child; tmp; tmp = tmp->next) { + if (!strcasecmp (tmp->name, "title")) { + title = tmp->data; + } + else if (!strcasecmp (tmp->name, "ref")) { + src = xml_parser_get_property (tmp, "href"); + } + else if (!strcasecmp (tmp->name, "starttime")) { + start = xml_parser_get_property (tmp, "value"); + } + else if (!strcasecmp (tmp->name, "duration")) { + duration = xml_parser_get_property (tmp, "value"); + } + } + + if (src) { + lprintf ("mrl:'%s'\n", src); + _x_demux_send_mrl_reference (this->stream, 0, src, title, + parse_time(start), parse_time(duration)); + } + } + } + } + + xml_parser_free_tree (root); + } + + if (!is_asx) { + /* No tags found? Might be a references list. */ + parse_ref (this, data, length); + } +} + +static void parse_smi (demux_playlist_t *this, char *data, int length) { + xml_node_t *root, *node, *tmp; + int is_smi = 0; + + xml_parser_init (data, length, XML_PARSER_CASE_SENSITIVE); + + if (xml_parser_build_tree (&root) >= 0) { + for (node = root; node; node = node->next) { + if (!strcmp (node->name, "smil")) + break; + } + + if (node) { + is_smi = 1; + + for (node = node->child; node; node = node->next) { + if (!strcmp (node->name, "body")) { + for (tmp = node->child; tmp; tmp = tmp->next) { + if (!strcmp (tmp->name, "audio") || !strcmp (tmp->name, "video")) { + const char *src, *title; + int start, end; + + src = xml_parser_get_property (tmp, "src"); + title = xml_parser_get_property (tmp, "title"); + start = parse_time (xml_parser_get_property (tmp, "clipBegin") ? : + xml_parser_get_property (tmp, "clip-begin")); + end = parse_time (xml_parser_get_property (tmp, "clipEnd") ? : + xml_parser_get_property (tmp, "clip-end")); + + if (src) { + lprintf ("mrl:'%s'\n", src); + _x_demux_send_mrl_reference (this->stream, 0, src, title, + start, end ? (end-start) : 0); + } + } + } + } + } + } + + xml_parser_free_tree (root); + } + + if (!is_smi) { + /* No tags found? Might be a RAM playlist. */ + parse_ram (this, data, length); + } +} + +static void parse_qtl (demux_playlist_t *this, char *data, int length) { + xml_node_t *root, *node; + + xml_parser_init (data, length, XML_PARSER_CASE_SENSITIVE); + + if (xml_parser_build_tree (&root) >= 0) { + for (node = root; node; node = node->next) { + if (!strcmp (node->name, "embed")) { + const char *src; + + src = xml_parser_get_property (node, "src"); + if (src) { + lprintf ("mrl:'%s'\n", src); + _x_demux_send_mrl_reference (this->stream, 0, src, NULL, 0, 0); + } + } + } + + xml_parser_free_tree (root); + } +} + +static void parse_xspf (demux_playlist_t *this, char *data, int length) { + xml_node_t *root, *node, *tmp; + + xml_parser_init (data, length, XML_PARSER_CASE_SENSITIVE); + + if (xml_parser_build_tree (&root) >= 0) { + for (node = root; node; node = node->next) { + if (!strcmp (node->name, "playlist")) + break; + } + if (node) { + for (node = node->child; node; node = node->next) { + if (!strcmp (node->name, "trackList")) + break; + } + } + if (node) { + for (node = node->child; node; node = node->next) { + if (!strcmp (node->name, "track")) { + char *src = NULL; + char *title = NULL; + + for (tmp = node->child; tmp; tmp = tmp->next) { + if (!strcmp (tmp->name, "location")) { + src = trim((char*)tmp->data); + } + else if (!strcmp (tmp->name, "title")) { + title = trim((char*)tmp->data); + } + } + + if (src) { + lprintf ("mrl:'%s'\n", src); + _x_demux_send_mrl_reference (this->stream, 0, src, title, 0, 0); + } + } + } + } + + xml_parser_free_tree (root); + } +} + +static void parse_rss (demux_playlist_t *this, char *data, int length) { + xml_node_t *root, *node, *item, *tmp; + + xml_parser_init (data, length, XML_PARSER_CASE_SENSITIVE); + + if (xml_parser_build_tree (&root) >= 0) { + for (node = root; node; node = node->next) { + if (!strcmp (node->name, "rss")) + break; + } + + if (node) { + for (node = node->child; node; node = node->next) { + if (strcmp (node->name, "channel")) + continue; + + for (item = node->child; item; item = item->next) { + if (!strcmp (item->name, "item")) { + const char *title = NULL; + const char *src = NULL; + + for (tmp = item->child; tmp; tmp = tmp->next) { + if (!strcmp (tmp->name, "title")) { + title = tmp->data; + } + else if (!strcmp (tmp->name, "enclosure")) { + src = xml_parser_get_property (tmp, "url"); + } + } + + if (src) { + lprintf ("mrl:'%s'\n", src); + _x_demux_send_mrl_reference (this->stream, 0, src, title, 0, 0); + } + } + } + } + } + + xml_parser_free_tree (root); + } +} + + +static void demux_playlist_send_headers (demux_plugin_t *this_gen) { + demux_playlist_t *this = (demux_playlist_t *) this_gen; + + this->status = DEMUX_OK; + + _x_demux_control_start (this->stream); + + this->input->seek (this->input, 0, SEEK_SET); +} + + +static int demux_playlist_send_chunk (demux_plugin_t *this_gen) { + demux_playlist_t *this = (demux_playlist_t *) this_gen; + char *data = NULL; + int length; + + length = this->input->get_length (this->input); + if (length > 0) { + data = xine_xmalloc (length+1); + if (data) + this->input->read (this->input, data, length); + } + else { + char buf[1024]; + int len; + + length = 0; + while ((len = this->input->read (this->input, buf, sizeof(buf))) > 0) { + data = realloc (data, length+len+1); + if (!data) + break; + + memcpy (data+length, buf, len); + length += len; + data[length] = '\0'; + } + } + + lprintf ("data:%p length:%d\n", data, length); + + if (data) { + switch (this->playlist) { + case XINE_PLT_REF: + parse_ref (this, data, length); + break; + case XINE_PLT_M3U: + parse_m3u (this, data, length); + break; + case XINE_PLT_RAM: + parse_ram (this, data, length); + break; + case XINE_PLT_PLS: + parse_pls (this, data, length); + break; + case XINE_PLT_ASX: + parse_asx (this, data, length); + break; + case XINE_PLT_SMI: + parse_smi (this, data, length); + break; + case XINE_PLT_QTL: + parse_qtl (this, data, length); + break; + case XINE_PLT_XSPF: + parse_xspf (this, data, length); + break; + case XINE_PLT_RSS: + parse_rss (this, data, length); + break; + default: + lprintf ("unexpected playlist type 0x%08x\n", this->playlist); + break; + } + + free (data); + } + + this->status = DEMUX_FINISHED; + + return DEMUX_FINISHED; +} + +static int demux_playlist_seek (demux_plugin_t *this_gen, + off_t start_pos, int start_time, int playing) { + return DEMUX_OK; +} + +static void demux_playlist_dispose (demux_plugin_t *this_gen) { + demux_playlist_t *this = (demux_playlist_t *) this_gen; + + free (this); +} + +static int demux_playlist_get_status (demux_plugin_t *this_gen) { + demux_playlist_t *this = (demux_playlist_t *) this_gen; + + return this->status; +} + +static int demux_playlist_get_stream_length (demux_plugin_t *this_gen) { + return 0; +} + +static uint32_t demux_playlist_get_capabilities (demux_plugin_t *this_gen) { + return DEMUX_CAP_NOCAP; +} + +static int demux_playlist_get_optional_data (demux_plugin_t *this_gen, + void *data, int data_type) { + return DEMUX_OPTIONAL_UNSUPPORTED; +} + + +static demux_plugin_t *open_plugin (demux_class_t *class_gen, + xine_stream_t *stream, input_plugin_t *input) { + demux_playlist_t *this; + + this = xine_xmalloc (sizeof (demux_playlist_t)); + this->xine = stream->xine; + this->stream = stream; + this->input = input; + + this->demux_plugin.send_headers = demux_playlist_send_headers; + this->demux_plugin.send_chunk = demux_playlist_send_chunk; + this->demux_plugin.seek = demux_playlist_seek; + this->demux_plugin.dispose = demux_playlist_dispose; + this->demux_plugin.get_status = demux_playlist_get_status; + this->demux_plugin.get_stream_length = demux_playlist_get_stream_length; + this->demux_plugin.get_capabilities = demux_playlist_get_capabilities; + this->demux_plugin.get_optional_data = demux_playlist_get_optional_data; + this->demux_plugin.demux_class = class_gen; + + switch (stream->content_detection_method) { + case METHOD_BY_EXTENSION: + lprintf ("detect by extension\n"); + this->playlist = detect_by_extension (input); + if (!this->playlist) { + free (this); + return NULL; + } + break; + + case METHOD_BY_CONTENT: + case METHOD_EXPLICIT: + lprintf ("detect by content\n"); + this->playlist = detect_by_content (input); + if (!this->playlist) { + free (this); + return NULL; + } + break; + + default: + free (this); + return NULL; + } + + lprintf ("playlist:0x%08x (%s)\n", this->playlist, (char*)&this->playlist); + + return &this->demux_plugin; +} + +static const char *get_description (demux_class_t *this_gen) { + return "Playlist demux plugin"; +} + +static const char *get_identifier (demux_class_t *this_gen) { + return "playlist"; +} + +static const char *get_extensions (demux_class_t *this_gen) { + return "m3u ram pls asx wax wvx smi smil qtl xspf rss"; +} + +static const char *get_mimetypes (demux_class_t *this_gen) { + return "audio/mpegurl: m3u: M3U playlist;" + "audio/x-mpegurl: m3u: M3U playlist;" + //"audio/x-pn-realaudio: ram: RAM playlist;" + //"audio/vnd.rn-realaudio: ram: RAM playlist;" + "audio/x-scpls: pls: Winamp playlist;" + "audio/x-ms-wax: wax, asx: WAX playlist;" + "audio/x-ms-wvx: wvx, asx: WVX playlist;" + "application/smil: smi, smil: SMIL playlist;" + "application/x-quicktimeplayer: qtl: Quicktime playlist;" + "application/xspf+xml: xspf: XSPF playlist;"; +} + +static void class_dispose (demux_class_t *this_gen) { + demux_playlist_class_t *this = (demux_playlist_class_t *) this_gen; + + free (this); +} + +static void *init_plugin (xine_t *xine, void *data) { + demux_playlist_class_t *this; + + this = xine_xmalloc (sizeof(demux_playlist_class_t)); + + this->demux_class.open_plugin = open_plugin; + this->demux_class.get_description = get_description; + this->demux_class.get_identifier = get_identifier; + this->demux_class.get_mimetypes = get_mimetypes; + this->demux_class.get_extensions = get_extensions; + this->demux_class.dispose = class_dispose; + + return this; +} + +/* + * exported plugin catalog entry + */ +static const demuxer_info_t demux_info_flv = { + 10 /* priority */ +}; + +const plugin_info_t xine_plugin_info[] EXPORTED = { + /* type, API, "name", version, special_info, init_function */ + { PLUGIN_DEMUX, 26, "playlist", XINE_VERSION_CODE, &demux_info_flv, init_plugin }, + { PLUGIN_NONE, 0, "", 0, NULL, NULL } +}; diff --git a/src/demuxers/demux_pva.c b/src/demuxers/demux_pva.c index d15aa605f..298d936b5 100644 --- a/src/demuxers/demux_pva.c +++ b/src/demuxers/demux_pva.c @@ -22,8 +22,6 @@ * TechnoTrend PVA File Demuxer by Mike Melanson (melanson@pcisys.net) * For more information regarding the PVA file format, refer to this PDF: * http://www.technotrend.de/download/av_format_v1.pdf - * - * $Id: demux_pva.c,v 1.25 2007/01/19 00:26:40 dgp85 Exp $ */ #ifdef HAVE_CONFIG_H diff --git a/src/demuxers/demux_qt.c b/src/demuxers/demux_qt.c index ec3fb6f74..89d0283ac 100644 --- a/src/demuxers/demux_qt.c +++ b/src/demuxers/demux_qt.c @@ -29,9 +29,6 @@ * parse_trak_atom * build_frame_table * free_qt_info - * - * $Id: demux_qt.c,v 1.214 2007/01/19 01:05:24 dgp85 Exp $ - * */ #ifdef HAVE_CONFIG_H diff --git a/src/demuxers/demux_rawdv.c b/src/demuxers/demux_rawdv.c index 130f15daa..2d21f080d 100644 --- a/src/demuxers/demux_rawdv.c +++ b/src/demuxers/demux_rawdv.c @@ -19,8 +19,6 @@ */ /* - * $Id: demux_rawdv.c,v 1.30 2007/01/19 00:26:40 dgp85 Exp $ - * * demultiplexer for raw dv streams */ diff --git a/src/demuxers/demux_real.c b/src/demuxers/demux_real.c index 957d5cc4e..60fa91451 100644 --- a/src/demuxers/demux_real.c +++ b/src/demuxers/demux_real.c @@ -30,8 +30,6 @@ * (C) Alex Beregszaszi <alex@naxine.org> * * Based on FFmpeg's libav/rm.c. - * - * $Id: demux_real.c,v 1.113 2007/02/20 00:34:56 dgp85 Exp $ */ #ifdef HAVE_CONFIG_H diff --git a/src/demuxers/demux_realaudio.c b/src/demuxers/demux_realaudio.c index 70329d2c6..1e7c3c7de 100644 --- a/src/demuxers/demux_realaudio.c +++ b/src/demuxers/demux_realaudio.c @@ -21,8 +21,6 @@ /* * RealAudio File Demuxer by Mike Melanson (melanson@pcisys.net) * improved by James Stembridge (jstembridge@users.sourceforge.net) - * - * $Id: demux_realaudio.c,v 1.34 2007/03/29 17:00:32 dgp85 Exp $ */ #ifdef HAVE_CONFIG_H diff --git a/src/demuxers/demux_roq.c b/src/demuxers/demux_roq.c index 77e3b6ce2..18edaea87 100644 --- a/src/demuxers/demux_roq.c +++ b/src/demuxers/demux_roq.c @@ -22,8 +22,6 @@ * RoQ File Demuxer by Mike Melanson (melanson@pcisys.net) * For more information regarding the RoQ file format, visit: * http://www.csse.monash.edu.au/~timf/ - * - * $Id: demux_roq.c,v 1.54 2007/01/19 00:26:40 dgp85 Exp $ */ #ifdef HAVE_CONFIG_H diff --git a/src/demuxers/demux_shn.c b/src/demuxers/demux_shn.c index a1a88e18d..87324ab45 100644 --- a/src/demuxers/demux_shn.c +++ b/src/demuxers/demux_shn.c @@ -16,8 +16,6 @@ * You 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 - * - * $Id: demux_shn.c,v 1.4 2007/01/19 00:26:40 dgp85 Exp $ */ #ifdef HAVE_CONFIG_H diff --git a/src/demuxers/demux_slave.c b/src/demuxers/demux_slave.c index e394cf447..436d37579 100644 --- a/src/demuxers/demux_slave.c +++ b/src/demuxers/demux_slave.c @@ -21,8 +21,6 @@ */ /* - * $Id: demux_slave.c,v 1.23 2007/01/19 01:05:24 dgp85 Exp $ - * * demuxer for slave "protocol" * master xine must be started with XINE_PARAM_BROADCASTER_PORT set, that is, * 'xine --broadcast-port <port_number>' diff --git a/src/demuxers/demux_smjpeg.c b/src/demuxers/demux_smjpeg.c index d387341a8..899fbf7e3 100644 --- a/src/demuxers/demux_smjpeg.c +++ b/src/demuxers/demux_smjpeg.c @@ -22,8 +22,6 @@ * SMJPEG File Demuxer by Mike Melanson (melanson@pcisys.net) * For more information on the SMJPEG file format, visit: * http://www.lokigames.com/development/smjpeg.php3 - * - * $Id: demux_smjpeg.c,v 1.51 2007/01/19 00:26:40 dgp85 Exp $ */ #ifdef HAVE_CONFIG_H diff --git a/src/demuxers/demux_snd.c b/src/demuxers/demux_snd.c index 16fd35201..0965a75ae 100644 --- a/src/demuxers/demux_snd.c +++ b/src/demuxers/demux_snd.c @@ -20,8 +20,6 @@ /* * SND/AU File Demuxer by Mike Melanson (melanson@pcisys.net) - * - * $Id: demux_snd.c,v 1.41 2007/01/19 00:26:40 dgp85 Exp $ */ #ifdef HAVE_CONFIG_H diff --git a/src/demuxers/demux_str.c b/src/demuxers/demux_str.c index 5d4047ce0..2cf542014 100644 --- a/src/demuxers/demux_str.c +++ b/src/demuxers/demux_str.c @@ -23,8 +23,6 @@ * and Stuart Caie (kyzer@4u.net) * This demuxer handles either raw STR files (which are just a concatenation * of raw compact disc sectors) or STR files with RIFF headers. - * - * $Id: demux_str.c,v 1.26 2007/01/19 00:26:40 dgp85 Exp $ */ /* diff --git a/src/demuxers/demux_ts.c b/src/demuxers/demux_ts.c index d7fd24773..19826bf71 100644 --- a/src/demuxers/demux_ts.c +++ b/src/demuxers/demux_ts.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: demux_ts.c,v 1.129 2007/04/02 10:46:08 dgp85 Exp $ - * * Demultiplexer for MPEG2 Transport Streams. * * For the purposes of playing video, we make some assumptions about the @@ -298,7 +296,6 @@ typedef struct { uint32_t pmt_pid[MAX_PMTS]; uint8_t *pmt[MAX_PMTS]; uint8_t *pmt_write_ptr[MAX_PMTS]; - uint32_t crc32_table[256]; uint32_t last_pmt_crc; /* * Stuff to do with the transport header. As well as the video @@ -358,28 +355,6 @@ typedef struct { } demux_ts_class_t; -static void demux_ts_build_crc32_table(demux_ts_t*this) { - uint32_t i, j, k; - - for( i = 0 ; i < 256 ; i++ ) { - k = 0; - for (j = (i << 24) | 0x800000 ; j != 0x80000000 ; j <<= 1) { - k = (k << 1) ^ (((k ^ j) & 0x80000000) ? 0x04c11db7 : 0); - } - this->crc32_table[i] = k; - } -} - -static uint32_t demux_ts_compute_crc32(demux_ts_t*this, uint8_t *data, - uint32_t length, uint32_t crc32) { - uint32_t i; - - for(i = 0; i < length; i++) { - crc32 = (crc32 << 8) ^ this->crc32_table[(crc32 >> 24) ^ data[i]]; - } - return crc32; -} - /* redefine abs as macro to handle 64-bit diffs. i guess llabs may not be available everywhere */ #define abs(x) ( ((x)<0) ? -(x) : (x) ) @@ -523,7 +498,7 @@ static void demux_ts_parse_pat (demux_ts_t*this, unsigned char *original_pkt, unsigned char *pkt, unsigned int pusi) { uint32_t table_id; uint32_t section_syntax_indicator; - uint32_t section_length; + int32_t section_length; uint32_t transport_stream_id; uint32_t version_number; uint32_t current_next_indicator; @@ -598,8 +573,7 @@ static void demux_ts_parse_pat (demux_ts_t*this, unsigned char *original_pkt, } /* Check CRC. */ - calc_crc32 = demux_ts_compute_crc32 (this, pkt+5, section_length+3-4, - 0xffffffff); + calc_crc32 = _x_compute_crc32 (pkt+5, section_length+3-4, 0xffffffff); if (crc32 != calc_crc32) { xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, "demux_ts: demux error! PAT with invalid CRC32: packet_crc32: %.8x calc_crc32: %.8x\n", @@ -1205,9 +1179,8 @@ printf("Program Number is %i, looking for %i\n",program_number,this->program_num crc32 |= (uint32_t) this->pmt[program_count][section_length+3-1] ; /* Check CRC. */ - calc_crc32 = demux_ts_compute_crc32 (this, - this->pmt[program_count], - section_length+3-4, 0xffffffff); + calc_crc32 = _x_compute_crc32 (this->pmt[program_count], + section_length+3-4, 0xffffffff); if (crc32 != calc_crc32) { xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, "demux_ts: demux error! PMT with invalid CRC32: packet_crc32: %#.8x calc_crc32: %#.8x\n", @@ -2028,8 +2001,6 @@ static void demux_ts_send_headers (demux_plugin_t *this_gen) { this->send_newpts = 1; - demux_ts_build_crc32_table (this); - this->status = DEMUX_OK ; this->send_end_buffers = 1; diff --git a/src/demuxers/demux_tta.c b/src/demuxers/demux_tta.c index da6af0060..9b2730018 100644 --- a/src/demuxers/demux_tta.c +++ b/src/demuxers/demux_tta.c @@ -19,8 +19,6 @@ * * True Audio demuxer by Diego Pettenò <flameeyes@gentoo.org> * Inspired by tta libavformat demuxer by Alex Beregszaszi - * - * $Id: demux_tta.c,v 1.4 2007/03/29 16:46:23 dgp85 Exp $ */ #define LOG_MODULE "demux_tta" diff --git a/src/demuxers/demux_vmd.c b/src/demuxers/demux_vmd.c index a1b107288..8b0087417 100644 --- a/src/demuxers/demux_vmd.c +++ b/src/demuxers/demux_vmd.c @@ -27,8 +27,6 @@ * Note that the only way that this demuxer validates by content is by * checking the first 2 bytes, which are 0x2E 0x03 in a Sierra VMD file. * There is a 1/65536 chance of a false positive using this method. - * - * $Id: demux_vmd.c,v 1.4 2007/01/19 00:26:40 dgp85 Exp $ */ #ifdef HAVE_CONFIG_H diff --git a/src/demuxers/demux_voc.c b/src/demuxers/demux_voc.c index f6b5caf7e..0439980f8 100644 --- a/src/demuxers/demux_voc.c +++ b/src/demuxers/demux_voc.c @@ -24,8 +24,6 @@ * possibly be seen in a VOC file. It only plays the first block in a file. * It will only play that block if it is PCM data. More variations will be * supported as they are encountered. - * - * $Id: demux_voc.c,v 1.41 2007/01/19 00:26:40 dgp85 Exp $ */ #ifdef HAVE_CONFIG_H diff --git a/src/demuxers/demux_vox.c b/src/demuxers/demux_vox.c index 31b33b8c6..3ce2ad705 100644 --- a/src/demuxers/demux_vox.c +++ b/src/demuxers/demux_vox.c @@ -21,9 +21,6 @@ /* * VOX Demuxer by Mike Melanson (melanson@pcisys.net) * This a demuxer for .vox files containing raw Dialogic ADPCM data. - * - * $Id: demux_vox.c,v 1.14 2007/01/19 00:26:40 dgp85 Exp $ - * */ #ifdef HAVE_CONFIG_H diff --git a/src/demuxers/demux_vqa.c b/src/demuxers/demux_vqa.c index 16e5da46c..40242476b 100644 --- a/src/demuxers/demux_vqa.c +++ b/src/demuxers/demux_vqa.c @@ -28,8 +28,6 @@ * However, seeking is infeasible due to the audio encoding: Each audio * block needs information from the previous audio block in order to be * decoded, thus making random seeking difficult. - * - * $Id: demux_vqa.c,v 1.42 2007/01/19 00:26:40 dgp85 Exp $ */ #ifdef HAVE_CONFIG_H diff --git a/src/demuxers/demux_wav.c b/src/demuxers/demux_wav.c index d306379e4..9b46336fe 100644 --- a/src/demuxers/demux_wav.c +++ b/src/demuxers/demux_wav.c @@ -21,8 +21,6 @@ /* * MS WAV File Demuxer by Mike Melanson (melanson@pcisys.net) * based on WAV specs that are available far and wide - * - * $Id: demux_wav.c,v 1.65 2007/03/17 20:57:04 dgp85 Exp $ */ #ifdef HAVE_CONFIG_H diff --git a/src/demuxers/demux_wc3movie.c b/src/demuxers/demux_wc3movie.c index 7cd579ba9..a69c6b46a 100644 --- a/src/demuxers/demux_wc3movie.c +++ b/src/demuxers/demux_wc3movie.c @@ -23,8 +23,6 @@ * by Mike Melanson (melanson@pcisys.net) * For more information on the MVE file format, visit: * http://www.pcisys.net/~melanson/codecs/ - * - * $Id: demux_wc3movie.c,v 1.54 2007/01/19 00:26:40 dgp85 Exp $ */ #ifdef HAVE_CONFIG_H diff --git a/src/demuxers/demux_yuv4mpeg2.c b/src/demuxers/demux_yuv4mpeg2.c index 8c080bae1..9c5856710 100644 --- a/src/demuxers/demux_yuv4mpeg2.c +++ b/src/demuxers/demux_yuv4mpeg2.c @@ -23,8 +23,6 @@ * For more information regarding the YUV4MPEG2 file format and associated * tools, visit: * http://mjpeg.sourceforge.net/ - * - * $Id: demux_yuv4mpeg2.c,v 1.44 2007/01/19 00:26:40 dgp85 Exp $ */ #ifdef HAVE_CONFIG_H diff --git a/src/demuxers/demux_yuv_frames.c b/src/demuxers/demux_yuv_frames.c index ff55765c3..774329c05 100644 --- a/src/demuxers/demux_yuv_frames.c +++ b/src/demuxers/demux_yuv_frames.c @@ -20,8 +20,6 @@ */ /* - * $Id: demux_yuv_frames.c,v 1.24 2007/01/19 01:05:24 dgp85 Exp $ - * * dummy demultiplexer for raw yuv frames (delivered by v4l) */ diff --git a/src/demuxers/ebml.c b/src/demuxers/ebml.c index 00c8e99cd..ac44aecd7 100644 --- a/src/demuxers/ebml.c +++ b/src/demuxers/ebml.c @@ -19,9 +19,6 @@ * * EBML parser * a lot of ideas from the gstreamer parser - * - * $Id: ebml.c,v 1.4 2005/11/28 12:24:57 valtri Exp $ - * */ #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/src/demuxers/ebml.h b/src/demuxers/ebml.h index 194903a3d..35078c502 100644 --- a/src/demuxers/ebml.h +++ b/src/demuxers/ebml.h @@ -19,9 +19,6 @@ * * EBML parser * a lot of ideas from the gstreamer parser - * - * $Id: ebml.h,v 1.1 2004/01/05 00:40:54 tmattern Exp $ - * */ #ifndef EBML_H #define EBML_H diff --git a/src/demuxers/group_audio.c b/src/demuxers/group_audio.c index 887d9de63..8d6c18190 100644 --- a/src/demuxers/group_audio.c +++ b/src/demuxers/group_audio.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * This file contains plugin entries for several demuxers used in games - * - * $Id: group_audio.c,v 1.26 2007/03/03 02:06:09 dgp85 Exp $ */ #ifdef HAVE_CONFIG_H diff --git a/src/demuxers/group_audio.h b/src/demuxers/group_audio.h index 3431aaba2..11aac35d7 100644 --- a/src/demuxers/group_audio.h +++ b/src/demuxers/group_audio.h @@ -16,8 +16,6 @@ * You 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 - * - * $Id: group_audio.h,v 1.9 2006/12/26 16:59:55 dgp85 Exp $ */ #ifndef HAVE_GROUP_AUDIO_H diff --git a/src/demuxers/group_games.c b/src/demuxers/group_games.c index 3aea78fac..ad257c2fb 100644 --- a/src/demuxers/group_games.c +++ b/src/demuxers/group_games.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * This file contains plugin entries for several demuxers used in games - * - * $Id: group_games.c,v 1.15 2006/07/10 22:08:13 dgp85 Exp $ */ #ifdef HAVE_CONFIG_H diff --git a/src/demuxers/group_games.h b/src/demuxers/group_games.h index 4024f84cc..f93d4bb07 100644 --- a/src/demuxers/group_games.h +++ b/src/demuxers/group_games.h @@ -16,8 +16,6 @@ * You 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 - * - * $Id: group_games.h,v 1.3 2004/02/13 13:48:03 tmmm Exp $ */ #ifndef HAVE_GROUP_GAMES_H diff --git a/src/demuxers/id3.c b/src/demuxers/id3.c index 14090579e..8eb413f83 100644 --- a/src/demuxers/id3.c +++ b/src/demuxers/id3.c @@ -28,8 +28,6 @@ * unzip support * * ID3v2 specs: http://www.id3.org/ - * - * $Id: id3.c,v 1.13 2007/03/03 00:58:52 dgp85 Exp $ */ #ifdef HAVE_CONFIG_H diff --git a/src/demuxers/id3.h b/src/demuxers/id3.h index e4d68f181..35f011f30 100644 --- a/src/demuxers/id3.h +++ b/src/demuxers/id3.h @@ -20,8 +20,6 @@ * ID3 tag parser * * Supported versions: v1, v1.1, v2.2, v2.3, v2.4 - * - * $Id: id3.h,v 1.6 2007/03/03 01:41:16 dgp85 Exp $ */ #ifndef ID3_H diff --git a/src/demuxers/iff.h b/src/demuxers/iff.h index 17c12bfe7..94830f69c 100644 --- a/src/demuxers/iff.h +++ b/src/demuxers/iff.h @@ -21,8 +21,6 @@ /* * IFF header file by Manfred Tremmel (Manfred.Tremmel@iiv.de) * Based on the information of the Amiga Developer CD - * - * $Id: iff.h,v 1.2 2004/02/25 18:57:36 manfredtremmel Exp $ */ #ifndef IFFP_IFF_H diff --git a/src/demuxers/matroska.h b/src/demuxers/matroska.h index f7a7eac2b..6806c207d 100644 --- a/src/demuxers/matroska.h +++ b/src/demuxers/matroska.h @@ -16,9 +16,6 @@ * You 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 - * - * $Id: matroska.h,v 1.11 2007/01/07 12:33:50 molivier Exp $ - * */ #ifndef MATROSKA_H #define MATROSKA_H diff --git a/src/dxr3/dxr3.h b/src/dxr3/dxr3.h index a48b5eb02..f08ddcd04 100644 --- a/src/dxr3/dxr3.h +++ b/src/dxr3/dxr3.h @@ -16,8 +16,6 @@ * You 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 - * - * $Id: dxr3.h,v 1.8 2004/04/10 15:29:57 mroi Exp $ */ #ifndef HAVE_DXR3_H diff --git a/src/dxr3/dxr3_decode_spu.c b/src/dxr3/dxr3_decode_spu.c index a5f56cece..139939d8e 100644 --- a/src/dxr3/dxr3_decode_spu.c +++ b/src/dxr3/dxr3_decode_spu.c @@ -16,8 +16,6 @@ * You 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 - * - * $Id: dxr3_decode_spu.c,v 1.56 2006/07/10 22:08:13 dgp85 Exp $ */ /* dxr3 spu decoder plugin. diff --git a/src/dxr3/dxr3_decode_video.c b/src/dxr3/dxr3_decode_video.c index e09f95631..3f1c273ff 100644 --- a/src/dxr3/dxr3_decode_video.c +++ b/src/dxr3/dxr3_decode_video.c @@ -16,8 +16,6 @@ * You 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 - * - * $Id: dxr3_decode_video.c,v 1.64 2006/07/10 22:08:13 dgp85 Exp $ */ /* dxr3 video decoder plugin. diff --git a/src/dxr3/dxr3_mpeg_encoders.c b/src/dxr3/dxr3_mpeg_encoders.c index 2ba796bb5..0c59b0b93 100644 --- a/src/dxr3/dxr3_mpeg_encoders.c +++ b/src/dxr3/dxr3_mpeg_encoders.c @@ -16,8 +16,6 @@ * You 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 - * - * $Id: dxr3_mpeg_encoders.c,v 1.25 2007/03/10 17:25:13 dgp85 Exp $ */ /* mpeg encoders for the dxr3 video out plugin. diff --git a/src/dxr3/dxr3_scr.c b/src/dxr3/dxr3_scr.c index cdd6fb4d2..8fb049656 100644 --- a/src/dxr3/dxr3_scr.c +++ b/src/dxr3/dxr3_scr.c @@ -16,8 +16,6 @@ * You 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 - * - * $Id: dxr3_scr.c,v 1.19 2004/08/16 15:52:24 mroi Exp $ */ /* dxr3 scr plugin. diff --git a/src/dxr3/dxr3_scr.h b/src/dxr3/dxr3_scr.h index 53315be43..d0e155c27 100644 --- a/src/dxr3/dxr3_scr.h +++ b/src/dxr3/dxr3_scr.h @@ -16,8 +16,6 @@ * You 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 - * - * $Id: dxr3_scr.h,v 1.7 2004/01/04 22:26:29 mroi Exp $ */ #include "xine_internal.h" diff --git a/src/dxr3/dxr3_spu_encoder.c b/src/dxr3/dxr3_spu_encoder.c index 10ef56af1..1dcc13b77 100644 --- a/src/dxr3/dxr3_spu_encoder.c +++ b/src/dxr3/dxr3_spu_encoder.c @@ -16,8 +16,6 @@ * You 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 - * - * $Id: dxr3_spu_encoder.c,v 1.9 2005/09/24 19:08:26 miguelfreitas Exp $ */ #include <stdio.h> diff --git a/src/dxr3/video_out_dxr3.c b/src/dxr3/video_out_dxr3.c index 58258bebe..73eb133e1 100644 --- a/src/dxr3/video_out_dxr3.c +++ b/src/dxr3/video_out_dxr3.c @@ -16,8 +16,6 @@ * You 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 - * - * $Id: video_out_dxr3.c,v 1.117 2006/07/17 17:19:51 dsalt Exp $ */ /* mpeg1 encoding video out plugin for the dxr3. diff --git a/src/dxr3/video_out_dxr3.h b/src/dxr3/video_out_dxr3.h index 2eb5619ce..0297204dd 100644 --- a/src/dxr3/video_out_dxr3.h +++ b/src/dxr3/video_out_dxr3.h @@ -16,8 +16,6 @@ * You 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 - * - * $Id: video_out_dxr3.h,v 1.25 2005/09/25 00:44:04 miguelfreitas Exp $ */ #ifdef HAVE_CONFIG_H diff --git a/src/input/base64.c b/src/input/base64.c index 2d553d498..ffb039802 100644 --- a/src/input/base64.c +++ b/src/input/base64.c @@ -19,7 +19,6 @@ * * Base64 encoding modified for Musicbrainz * relicensed under the GNU General Public License for use in xine-lib - * */ /* -------------------------------------------------------------------------- @@ -41,8 +40,6 @@ License along with this library; if not, write to the Free Software 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 $ - ----------------------------------------------------------------------------*/ /* * Program: RFC-822 routines (originally from SMTP) @@ -84,7 +81,6 @@ * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF * CONTRACT, TORT (INCLUDING NEGLIGENCE) OR STRICT LIABILITY, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - * */ #include <ctype.h> diff --git a/src/input/base64.h b/src/input/base64.h index 9c6ba63b6..5cc94d7f0 100644 --- a/src/input/base64.h +++ b/src/input/base64.h @@ -19,7 +19,6 @@ * * Base64 encoding modified for Musicbrainz * relicensed under the GNU General Public License for use in xine-lib - * */ /* -------------------------------------------------------------------------- @@ -41,8 +40,6 @@ License along with this library; if not, write to the Free Software 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 $ - ----------------------------------------------------------------------------*/ /* * Program: RFC-822 routines (originally from SMTP) @@ -84,7 +81,6 @@ * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF * CONTRACT, TORT (INCLUDING NEGLIGENCE) OR STRICT LIABILITY, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - * */ #ifndef BASE64_H diff --git a/src/input/http_helper.c b/src/input/http_helper.c index dcd57ebee..4883763b0 100644 --- a/src/input/http_helper.c +++ b/src/input/http_helper.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * URL helper functions - * - * $Id: http_helper.c,v 1.9 2006/11/19 15:38:47 dgp85 Exp $ */ #ifdef HAVE_CONFIG_H diff --git a/src/input/http_helper.h b/src/input/http_helper.h index d3ac0ea95..3ce3f2b7c 100644 --- a/src/input/http_helper.h +++ b/src/input/http_helper.h @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * URL helper functions - * - * $Id: http_helper.h,v 1.3 2004/12/24 01:59:12 dsalt Exp $ */ #ifndef HTTP_HELPER_H diff --git a/src/input/input_cdda.c b/src/input/input_cdda.c index 8a5a099d0..43baa3c4a 100644 --- a/src/input/input_cdda.c +++ b/src/input/input_cdda.c @@ -19,8 +19,6 @@ * * Compact Disc Digital Audio (CDDA) Input Plugin * by Mike Melanson (melanson@pcisys.net) - * - * $Id: input_cdda.c,v 1.94 2007/03/10 00:48:59 dgp85 Exp $ */ #ifdef HAVE_CONFIG_H diff --git a/src/input/input_dvb.c b/src/input/input_dvb.c index 1715c5a2f..fbfc62921 100644 --- a/src/input/input_dvb.c +++ b/src/input/input_dvb.c @@ -330,8 +330,6 @@ typedef struct { osd_object_t *background; xine_event_queue_t *event_queue; - /* CRC table for PAT rebuilding */ - unsigned long crc32_table[256]; /* scratch buffer for forward seeking */ char seek_buf[BUFSIZE]; @@ -450,28 +448,6 @@ static void print_info(const char* estring) { } #endif -static void ts_build_crc32_table(dvb_input_plugin_t *this) { - uint32_t i, j, k; - - for( i = 0 ; i < 256 ; i++ ) { - k = 0; - for (j = (i << 24) | 0x800000 ; j != 0x80000000 ; j <<= 1) { - k = (k << 1) ^ (((k ^ j) & 0x80000000) ? 0x04c11db7 : 0); - } - this->crc32_table[i] = k; - } -} - -static uint32_t ts_compute_crc32(dvb_input_plugin_t *this, uint8_t *data, - uint32_t length, uint32_t crc32) { - uint32_t i; - - for(i = 0; i < length; i++) { - crc32 = (crc32 << 8) ^ this->crc32_table[(crc32 >> 24) ^ data[i]]; - } - return crc32; -} - static unsigned int getbits(unsigned char *buffer, unsigned int bitpos, unsigned int bitcount) { @@ -2480,7 +2456,7 @@ static void ts_rewrite_packets (dvb_input_plugin_t *this, unsigned char * origin originalPkt[11]=(this->channels[this->channel].pmtpid >> 8) & 0xff; originalPkt[12]=this->channels[this->channel].pmtpid & 0xff; - crc= ts_compute_crc32 (this, originalPkt+1, 12, 0xffffffff); + crc= _x_compute_crc32 (originalPkt+1, 12, 0xffffffff); originalPkt[13]=(crc>>24) & 0xff; originalPkt[14]=(crc>>16) & 0xff; @@ -3095,8 +3071,6 @@ static int dvb_plugin_open(input_plugin_t * this_gen) snprintf(str, 256, "%s", this->channels[this->channel].name); _x_meta_info_set(this->stream, XINE_META_INFO_TITLE, str); - /* compute CRC table for rebuilding pat */ - ts_build_crc32_table(this); /* Clear all pids, the pmt will tell us which to use */ for (x = 0; x < MAX_FILTERS; x++){ @@ -3198,26 +3172,38 @@ static char **dvb_class_get_autoplay_list(input_class_t * this_gen, dvb_input_class_t *class = (dvb_input_class_t *) this_gen; channel_t *channels=NULL; char foobuffer[BUFSIZE]; - int ch, apch, num_channels; + int ch, apch, num_channels = 0; int default_channel = -1; xine_cfg_entry_t lastchannel_enable = {0}; xine_cfg_entry_t lastchannel; - num_channels = 0; + /* need to probe card here to get fe_type to read in channels.conf */ + tuner_t *tuner; + xine_cfg_entry_t adapter; + + xine_config_lookup_entry(class->xine, "media.dvb.adapter", &adapter); - if (!(channels = load_channels(class->xine, NULL, &num_channels, 0))) { - static char *placefile = NULL; + if (!(tuner = tuner_init(class->xine,adapter.num_value))) { + xprintf(class->xine, XINE_VERBOSITY_LOG, _("input_dvb: cannot open dvb device\n")); + class->mrls[0]="Sorry, No DVB input device found."; + *num_files=1; + return class->mrls; + } + + if (!(channels = load_channels(class->xine, NULL, &num_channels, tuner->feinfo.type))) { /* channels.conf not found in .xine */ - class->mrls[0]="Sorry, no channels.conf found."; - class->mrls[1]="Please run the scan utility from the DVB"; - class->mrls[2]="drivers apps package and place the file in"; - if (!placefile) - asprintf (&placefile, "%s/"PACKAGE"/", xdgConfigHome(class->xine->basedir_handle)); - class->mrls[3]=placefile; - *num_files=4; + class->mrls[0]="Sorry, No valid channels.conf found"; + class->mrls[1]="for the selected DVB device."; + class->mrls[2]="Please run the dvbscan utility"; + class->mrls[3]="from the dvb drivers apps package"; + class->mrls[4]="and place the file in ~/.xine/"; + *num_files=5; + tuner_dispose(tuner); return class->mrls; } + tuner_dispose(tuner); + if (xine_config_lookup_entry(class->xine, "media.dvb.remember_channel", &lastchannel_enable) && lastchannel_enable.num_value && xine_config_lookup_entry(class->xine, "media.dvb.last_channel", &lastchannel)) diff --git a/src/input/input_dvd.c b/src/input/input_dvd.c index 37c07c218..55e975eab 100644 --- a/src/input/input_dvd.c +++ b/src/input/input_dvd.c @@ -17,9 +17,6 @@ * You 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 - * - * $Id: input_dvd.c,v 1.216 2007/02/20 01:04:07 dgp85 Exp $ - * */ /* This file was origninally part of the xine-dvdnav project diff --git a/src/input/input_file.c b/src/input/input_file.c index 6e443063c..0ed4ab682 100644 --- a/src/input/input_file.c +++ b/src/input/input_file.c @@ -16,8 +16,6 @@ * You 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 - * - * $Id: input_file.c,v 1.122 2007/03/29 19:47:17 dgp85 Exp $ */ #ifdef HAVE_CONFIG_H diff --git a/src/input/input_gnome_vfs.c b/src/input/input_gnome_vfs.c index 866cc128c..3315a52ea 100644 --- a/src/input/input_gnome_vfs.c +++ b/src/input/input_gnome_vfs.c @@ -17,8 +17,6 @@ * You 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 - * - * $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 eb9fab144..328ab523e 100644 --- a/src/input/input_http.c +++ b/src/input/input_http.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * input plugin for http network streams - * - * $Id: input_http.c,v 1.129 2007/03/17 16:47:16 dgp85 Exp $ */ #ifdef HAVE_CONFIG_H diff --git a/src/input/input_mms.c b/src/input/input_mms.c index 4fabb766e..3e4b7172c 100644 --- a/src/input/input_mms.c +++ b/src/input/input_mms.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: input_mms.c,v 1.70 2007/02/20 00:51:39 dgp85 Exp $ - * * mms input plugin based on work from major mms */ diff --git a/src/input/input_net.c b/src/input/input_net.c index 2a7b3e267..b3d7a5396 100644 --- a/src/input/input_net.c +++ b/src/input/input_net.c @@ -20,8 +20,6 @@ * 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 ..) * - * $Id: input_net.c,v 1.70 2007/01/19 01:05:25 dgp85 Exp $ - * * how to set up mp1e for use with this plugin: * * use mp1 to capture the live stream, e.g. diff --git a/src/input/input_plugin.h b/src/input/input_plugin.h index 55bc14ed4..3f59bab6c 100644 --- a/src/input/input_plugin.h +++ b/src/input/input_plugin.h @@ -16,8 +16,6 @@ * You 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 - * - * $Id: input_plugin.h,v 1.64 2007/01/19 01:05:25 dgp85 Exp $ */ #ifndef HAVE_INPUT_PLUGIN_H diff --git a/src/input/input_pvr.c b/src/input/input_pvr.c index 74022965f..84b8468db 100644 --- a/src/input/input_pvr.c +++ b/src/input/input_pvr.c @@ -37,8 +37,6 @@ * * usage: * xine pvr:/<prefix_to_tmp_files>\!<prefix_to_saved_files>\!<max_page_age> - * - * $Id: input_pvr.c,v 1.65 2007/01/19 01:05:25 dgp85 Exp $ */ /************************************************************************** diff --git a/src/input/input_smb.c b/src/input/input_smb.c index 0fd2c6f18..9fd4e50c8 100644 --- a/src/input/input_smb.c +++ b/src/input/input_smb.c @@ -16,8 +16,6 @@ * You 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 - * - * $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 64672fce3..01fef7431 100644 --- a/src/input/input_stdin_fifo.c +++ b/src/input/input_stdin_fifo.c @@ -16,8 +16,6 @@ * You 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 - * - * $Id: input_stdin_fifo.c,v 1.70 2007/02/20 00:34:56 dgp85 Exp $ */ #ifdef HAVE_CONFIG_H diff --git a/src/input/input_vcd.c b/src/input/input_vcd.c index 7ec4b1ea8..c422b2531 100644 --- a/src/input/input_vcd.c +++ b/src/input/input_vcd.c @@ -16,9 +16,6 @@ * You 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 - * - * $Id: input_vcd.c,v 1.89 2007/03/16 16:32:58 dgp85 Exp $ - * */ #ifdef HAVE_CONFIG_H diff --git a/src/input/libdvdnav/decoder.c b/src/input/libdvdnav/decoder.c index 0a2d0c3cb..3dff4a080 100644 --- a/src/input/libdvdnav/decoder.c +++ b/src/input/libdvdnav/decoder.c @@ -18,9 +18,6 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - * - * $Id: decoder.c,v 1.14 2004/03/16 11:43:38 mroi Exp $ - * */ #ifdef HAVE_CONFIG_H diff --git a/src/input/libdvdnav/decoder.h b/src/input/libdvdnav/decoder.h index 13768a70e..fa9cef445 100644 --- a/src/input/libdvdnav/decoder.h +++ b/src/input/libdvdnav/decoder.h @@ -17,9 +17,6 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - * - * $Id: decoder.h,v 1.9 2004/03/16 11:43:38 mroi Exp $ - * */ #ifndef DECODER_H_INCLUDED diff --git a/src/input/libdvdnav/dvd_types.h b/src/input/libdvdnav/dvd_types.h index 17c437712..949c67a48 100644 --- a/src/input/libdvdnav/dvd_types.h +++ b/src/input/libdvdnav/dvd_types.h @@ -17,9 +17,6 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - * - * $Id: dvd_types.h,v 1.4 2003/04/29 15:58:30 jcdutton Exp $ - * */ /* diff --git a/src/input/libdvdnav/dvdnav.c b/src/input/libdvdnav/dvdnav.c index 6c1852885..86b6a4fa7 100644 --- a/src/input/libdvdnav/dvdnav.c +++ b/src/input/libdvdnav/dvdnav.c @@ -16,9 +16,6 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - * - * $Id: dvdnav.c,v 1.34 2005/10/15 14:04:05 jcdutton Exp $ - * */ #ifdef HAVE_CONFIG_H diff --git a/src/input/libdvdnav/dvdnav.h b/src/input/libdvdnav/dvdnav.h index 6942078da..fd86da747 100644 --- a/src/input/libdvdnav/dvdnav.h +++ b/src/input/libdvdnav/dvdnav.h @@ -16,9 +16,6 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - * - * $Id: dvdnav.h,v 1.15 2005/10/14 21:02:16 miguelfreitas Exp $ - * */ /* diff --git a/src/input/libdvdnav/dvdnav_events.h b/src/input/libdvdnav/dvdnav_events.h index 492321533..9191c1ae5 100644 --- a/src/input/libdvdnav/dvdnav_events.h +++ b/src/input/libdvdnav/dvdnav_events.h @@ -16,9 +16,6 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - * - * $Id: dvdnav_events.h,v 1.11 2003/04/07 18:10:48 mroi Exp $ - * */ /* diff --git a/src/input/libdvdnav/dvdnav_internal.h b/src/input/libdvdnav/dvdnav_internal.h index 1f27c5ebb..32ba3dad4 100644 --- a/src/input/libdvdnav/dvdnav_internal.h +++ b/src/input/libdvdnav/dvdnav_internal.h @@ -16,9 +16,6 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - * - * $Id: dvdnav_internal.h,v 1.18 2006/09/26 20:31:40 dgp85 Exp $ - * */ #ifndef DVDNAV_INTERNAL_H_INCLUDED diff --git a/src/input/libdvdnav/highlight.c b/src/input/libdvdnav/highlight.c index ac417f155..f0d60f005 100644 --- a/src/input/libdvdnav/highlight.c +++ b/src/input/libdvdnav/highlight.c @@ -16,9 +16,6 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - * - * $Id: highlight.c,v 1.17 2004/03/16 11:43:38 mroi Exp $ - * */ #ifdef HAVE_CONFIG_H diff --git a/src/input/libdvdnav/navigation.c b/src/input/libdvdnav/navigation.c index 1fe90f697..d7e092a41 100644 --- a/src/input/libdvdnav/navigation.c +++ b/src/input/libdvdnav/navigation.c @@ -16,9 +16,6 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - * - * $Id: navigation.c,v 1.11 2004/06/20 16:59:13 mroi Exp $ - * */ #ifdef HAVE_CONFIG_H diff --git a/src/input/libdvdnav/read_cache.c b/src/input/libdvdnav/read_cache.c index 5d0515260..4c237c5d6 100644 --- a/src/input/libdvdnav/read_cache.c +++ b/src/input/libdvdnav/read_cache.c @@ -17,9 +17,6 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - * - * $Id: read_cache.c,v 1.12 2004/03/16 11:43:38 mroi Exp $ - * */ /* * There was a multithreaded read ahead cache in here for some time, but diff --git a/src/input/libdvdnav/read_cache.h b/src/input/libdvdnav/read_cache.h index 23c58c58e..c860872ea 100644 --- a/src/input/libdvdnav/read_cache.h +++ b/src/input/libdvdnav/read_cache.h @@ -16,9 +16,6 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - * - * $Id: read_cache.h,v 1.1 2002/08/08 17:49:21 richwareham Exp $ - * */ #ifndef __DVDNAV_READ_CACHE_H diff --git a/src/input/libdvdnav/remap.c b/src/input/libdvdnav/remap.c index f2049ac06..43c81c66f 100644 --- a/src/input/libdvdnav/remap.c +++ b/src/input/libdvdnav/remap.c @@ -14,8 +14,6 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - * - * $Id: remap.c,v 1.6 2006/12/08 16:26:10 mshopf Exp $ */ #include <stdlib.h> diff --git a/src/input/libdvdnav/remap.h b/src/input/libdvdnav/remap.h index 5440843c8..c79a0ed43 100644 --- a/src/input/libdvdnav/remap.h +++ b/src/input/libdvdnav/remap.h @@ -14,8 +14,6 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - * - * $Id: remap.h,v 1.2 2003/02/20 16:02:00 mroi Exp $ */ #ifndef __REMAP__H diff --git a/src/input/libdvdnav/searching.c b/src/input/libdvdnav/searching.c index 3da9efecf..c9b2244bb 100644 --- a/src/input/libdvdnav/searching.c +++ b/src/input/libdvdnav/searching.c @@ -16,9 +16,6 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - * - * $Id: searching.c,v 1.20 2006/09/17 13:01:08 valtri Exp $ - * */ #ifdef HAVE_CONFIG_H diff --git a/src/input/libdvdnav/settings.c b/src/input/libdvdnav/settings.c index 62fcc7933..e0b283633 100644 --- a/src/input/libdvdnav/settings.c +++ b/src/input/libdvdnav/settings.c @@ -16,9 +16,6 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - * - * $Id: settings.c,v 1.7 2004/03/16 11:43:38 mroi Exp $ - * */ #ifdef HAVE_CONFIG_H diff --git a/src/input/libdvdnav/vm.c b/src/input/libdvdnav/vm.c index 6c01d14e8..b20ecf0e2 100644 --- a/src/input/libdvdnav/vm.c +++ b/src/input/libdvdnav/vm.c @@ -19,9 +19,6 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - * - * $Id: vm.c,v 1.32 2004/12/20 19:27:20 mroi Exp $ - * */ #ifdef HAVE_CONFIG_H diff --git a/src/input/libdvdnav/vm.h b/src/input/libdvdnav/vm.h index 214570254..a7411b494 100644 --- a/src/input/libdvdnav/vm.h +++ b/src/input/libdvdnav/vm.h @@ -18,9 +18,6 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - * - * $Id: vm.h,v 1.11 2004/10/05 19:07:10 hadess Exp $ - * */ #ifndef VM_H_INCLUDED diff --git a/src/input/libdvdnav/vmcmd.c b/src/input/libdvdnav/vmcmd.c index 3e0a5fb55..24bdfe6e2 100644 --- a/src/input/libdvdnav/vmcmd.c +++ b/src/input/libdvdnav/vmcmd.c @@ -18,9 +18,6 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - * - * $Id: vmcmd.c,v 1.6 2004/03/16 11:43:38 mroi Exp $ - * */ #ifdef HAVE_CONFIG_H diff --git a/src/input/libdvdnav/vmcmd.h b/src/input/libdvdnav/vmcmd.h index d3fd53ec2..12420f2de 100644 --- a/src/input/libdvdnav/vmcmd.h +++ b/src/input/libdvdnav/vmcmd.h @@ -17,9 +17,6 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - * - * $Id: vmcmd.h,v 1.7 2003/05/11 13:44:05 jcdutton Exp $ - * */ #ifndef VMCMD_H_INCLUDED diff --git a/src/input/libreal/asmrp.c b/src/input/libreal/asmrp.c index 9bdc2536b..f7206b583 100644 --- a/src/input/libreal/asmrp.c +++ b/src/input/libreal/asmrp.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: asmrp.c,v 1.10 2006/12/25 15:39:31 dgp85 Exp $ - * * a parser for real's asm rules * * grammar for these rules: diff --git a/src/input/libreal/asmrp.h b/src/input/libreal/asmrp.h index 18dd0a314..dcc373bd0 100644 --- a/src/input/libreal/asmrp.h +++ b/src/input/libreal/asmrp.h @@ -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: asmrp.h,v 1.3 2006/11/29 19:43:01 dgp85 Exp $ - * * a parser for real's asm rules * * grammar for these rules: diff --git a/src/input/libreal/real.c b/src/input/libreal/real.c index ef2d266e8..9ea65d9df 100644 --- a/src/input/libreal/real.c +++ b/src/input/libreal/real.c @@ -17,11 +17,8 @@ * along with this program; if not, write to the Free Software * 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 $ - * * special functions for real streams. * adopted from joschkas real tools. - * */ #include <stdio.h> diff --git a/src/input/libreal/real.h b/src/input/libreal/real.h index bc6078379..edcd170f8 100644 --- a/src/input/libreal/real.h +++ b/src/input/libreal/real.h @@ -17,11 +17,8 @@ * along with this program; if not, write to the Free Software * 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 $ - * * special functions for real streams. * adopted from joschkas real tools. - * */ #ifndef HAVE_REAL_H diff --git a/src/input/libreal/rmff.c b/src/input/libreal/rmff.c index 6a9854f61..159b81ee6 100644 --- a/src/input/libreal/rmff.c +++ b/src/input/libreal/rmff.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: rmff.c,v 1.8 2006/06/20 01:07:58 dgp85 Exp $ - * * functions for real media file format * adopted from joschkas real tools */ diff --git a/src/input/libreal/rmff.h b/src/input/libreal/rmff.h index 29c519a13..d39942088 100644 --- a/src/input/libreal/rmff.h +++ b/src/input/libreal/rmff.h @@ -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: rmff.h,v 1.5 2004/04/06 19:20:16 valtri Exp $ - * * some functions for real media file headers * adopted from joschkas real tools */ diff --git a/src/input/libreal/sdpplin.c b/src/input/libreal/sdpplin.c index 30977223e..c62b6bbc1 100644 --- a/src/input/libreal/sdpplin.c +++ b/src/input/libreal/sdpplin.c @@ -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: sdpplin.c,v 1.8 2006/12/25 16:21:56 dgp85 Exp $ - * * sdp/sdpplin parser. - * */ #define LOG_MODULE "sdpplin" diff --git a/src/input/libreal/sdpplin.h b/src/input/libreal/sdpplin.h index e6994642b..cb3b434d4 100644 --- a/src/input/libreal/sdpplin.h +++ b/src/input/libreal/sdpplin.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: sdpplin.h,v 1.2 2003/12/09 00:02:30 f1rmb Exp $ - * * sdp/sdpplin parser. - * */ #ifndef HAVE_SDPPLIN_H diff --git a/src/input/librtsp/rtsp.c b/src/input/librtsp/rtsp.c index 1819dd6e7..530ffc6cf 100644 --- a/src/input/librtsp/rtsp.c +++ b/src/input/librtsp/rtsp.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: rtsp.c,v 1.21 2006/06/20 01:07:58 dgp85 Exp $ - * * a minimalistic implementation of rtsp protocol, * *not* RFC 2326 compilant yet. */ diff --git a/src/input/librtsp/rtsp.h b/src/input/librtsp/rtsp.h index e4340ee9a..dc2624459 100644 --- a/src/input/librtsp/rtsp.h +++ b/src/input/librtsp/rtsp.h @@ -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: rtsp.h,v 1.4 2003/12/09 00:02:31 f1rmb Exp $ - * * a minimalistic implementation of rtsp protocol, * *not* RFC 2326 compilant yet. */ diff --git a/src/input/librtsp/rtsp_session.c b/src/input/librtsp/rtsp_session.c index 70ee18a62..f3ddb59bc 100644 --- a/src/input/librtsp/rtsp_session.c +++ b/src/input/librtsp/rtsp_session.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: rtsp_session.c,v 1.19 2006/12/22 18:08:10 klan Exp $ - * * high level interface to rtsp servers. */ diff --git a/src/input/librtsp/rtsp_session.h b/src/input/librtsp/rtsp_session.h index e00206f3e..b47db0730 100644 --- a/src/input/librtsp/rtsp_session.h +++ b/src/input/librtsp/rtsp_session.h @@ -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: rtsp_session.h,v 1.7 2006/12/18 21:31:47 klan Exp $ - * * high level interface to rtsp servers. */ diff --git a/src/input/mms.c b/src/input/mms.c index 89da1d9b5..f11a89cf3 100644 --- a/src/input/mms.c +++ b/src/input/mms.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: mms.c,v 1.65 2007/02/20 00:34:56 dgp85 Exp $ - * * MMS over TCP protocol * based on work from major mms * utility functions to handle communication with an mms server diff --git a/src/input/mms.h b/src/input/mms.h index 2df16fcdc..a483fa0c6 100644 --- a/src/input/mms.h +++ b/src/input/mms.h @@ -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: mms.h,v 1.13 2007/01/03 15:09:42 klan Exp $ - * * libmms public header */ diff --git a/src/input/mmsh.c b/src/input/mmsh.c index 70db4adee..ae1c62bc1 100644 --- a/src/input/mmsh.c +++ b/src/input/mmsh.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: mmsh.c,v 1.42 2007/01/11 16:20:55 klan Exp $ - * * MMS over HTTP protocol * written by Thibaut Mattern * based on mms.c and specs from avifile diff --git a/src/input/mmsh.h b/src/input/mmsh.h index 403115bd1..633d3b5f6 100644 --- a/src/input/mmsh.h +++ b/src/input/mmsh.h @@ -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: mmsh.h,v 1.6 2007/01/09 20:51:00 klan Exp $ - * * libmmsh public header */ diff --git a/src/input/pnm.c b/src/input/pnm.c index c97dca75b..38d65b850 100644 --- a/src/input/pnm.c +++ b/src/input/pnm.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: pnm.c,v 1.22 2006/06/20 01:46:41 dgp85 Exp $ - * * pnm protocol implementation * based upon code from joschka */ diff --git a/src/input/pnm.h b/src/input/pnm.h index 94574e2fb..838fbadcc 100644 --- a/src/input/pnm.h +++ b/src/input/pnm.h @@ -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: pnm.h,v 1.5 2003/12/09 00:02:30 f1rmb Exp $ - * * pnm util functions header by joschka */ diff --git a/src/input/sha1.c b/src/input/sha1.c index aa46f0311..b70e50d5f 100644 --- a/src/input/sha1.c +++ b/src/input/sha1.c @@ -9,8 +9,6 @@ * Further modifications to include the "UNRAVEL" stuff, below * * This code is in the public domain - * - * $Id: sha1.c,v 1.1 2004/05/05 09:11:39 hadess Exp $ */ #include <string.h> diff --git a/src/input/sha1.h b/src/input/sha1.h index 6657c92e3..9f2659d60 100644 --- a/src/input/sha1.h +++ b/src/input/sha1.h @@ -3,7 +3,6 @@ /* from Peter C. Gutmann's implementation as found in */ /* Applied Cryptography by Bruce Schneier */ /* This code is in the public domain */ -/* $Id: sha1.h,v 1.1 2004/05/05 09:11:39 hadess Exp $ */ #ifndef SHA_H #define SHA_H diff --git a/src/input/vcd/xine-extra.c b/src/input/vcd/xine-extra.c index b0423a913..79c962a79 100644 --- a/src/input/vcd/xine-extra.c +++ b/src/input/vcd/xine-extra.c @@ -1,5 +1,4 @@ /* - $Id: xine-extra.c,v 1.5 2006/09/09 17:41:45 dgp85 Exp $ Copyright (C) 2002 Rocky Bernstein <rocky@panix.com> diff --git a/src/input/vcd/xine-extra.h b/src/input/vcd/xine-extra.h index f4051cf52..0650f863d 100644 --- a/src/input/vcd/xine-extra.h +++ b/src/input/vcd/xine-extra.h @@ -1,5 +1,4 @@ /* - $Id: xine-extra.h,v 1.2 2006/04/21 23:15:45 dsalt Exp $ Copyright (C) 2002 Rocky Bernstein <rocky@panix.com> diff --git a/src/input/vcd/xineplug_inp_vcd.c b/src/input/vcd/xineplug_inp_vcd.c index ecd0b020a..474cc7339 100644 --- a/src/input/vcd/xineplug_inp_vcd.c +++ b/src/input/vcd/xineplug_inp_vcd.c @@ -1,5 +1,4 @@ /* - $Id: xineplug_inp_vcd.c,v 1.53 2007/02/08 02:40:23 dsalt Exp $ Copyright (C) 2002, 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com> diff --git a/src/libffmpeg/ff_audio_decoder.c b/src/libffmpeg/ff_audio_decoder.c index e125e6e39..b9762c66b 100644 --- a/src/libffmpeg/ff_audio_decoder.c +++ b/src/libffmpeg/ff_audio_decoder.c @@ -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: audio_decoder.c,v 1.33 2007/01/28 18:38:33 miguelfreitas Exp $ - * * xine audio decoder plugin using ffmpeg - * */ #ifdef HAVE_CONFIG_H diff --git a/src/libffmpeg/ff_dvaudio_decoder.c b/src/libffmpeg/ff_dvaudio_decoder.c index 85f4a4842..08ddf4e30 100644 --- a/src/libffmpeg/ff_dvaudio_decoder.c +++ b/src/libffmpeg/ff_dvaudio_decoder.c @@ -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: dvaudio_decoder.c,v 1.11 2006/07/10 22:08:29 dgp85 Exp $ - * * dv audio decoder based on patch by Dan Dennedy <dan@dennedy.org> - * */ #ifdef HAVE_CONFIG_H diff --git a/src/libffmpeg/ff_mpeg_parser.c b/src/libffmpeg/ff_mpeg_parser.c index 795dee646..70901d93b 100644 --- a/src/libffmpeg/ff_mpeg_parser.c +++ b/src/libffmpeg/ff_mpeg_parser.c @@ -19,8 +19,6 @@ * * Simple MPEG-ES parser/framer by Thibaut Mattern (tmattern@noos.fr) * based on libmpeg2 decoder. - * - * $Id: mpeg_parser.c,v 1.7 2007/03/29 18:52:45 dgp85 Exp $ */ #define LOG_MODULE "mpeg_parser" #define LOG_VERBOSE diff --git a/src/libffmpeg/ff_mpeg_parser.h b/src/libffmpeg/ff_mpeg_parser.h index 8644b2379..ea43a6ce4 100644 --- a/src/libffmpeg/ff_mpeg_parser.h +++ b/src/libffmpeg/ff_mpeg_parser.h @@ -19,8 +19,6 @@ * * Simple MPEG-ES parser/framer by Thibaut Mattern (tmattern@noos.fr) * based on libmpeg2 decoder. - * - * $Id: mpeg_parser.h,v 1.5 2007/03/29 18:52:45 dgp85 Exp $ */ #ifndef HAVE_MPEG_PARSER_H #define HAVE_MPEG_PARSER_H diff --git a/src/libffmpeg/ff_video_decoder.c b/src/libffmpeg/ff_video_decoder.c index e823b392c..a941481ae 100644 --- a/src/libffmpeg/ff_video_decoder.c +++ b/src/libffmpeg/ff_video_decoder.c @@ -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: video_decoder.c,v 1.73 2007/03/29 18:41:02 dgp85 Exp $ - * * xine video decoder plugin using ffmpeg - * */ #ifdef HAVE_CONFIG_H @@ -86,6 +83,7 @@ struct ff_video_decoder_s { uint8_t yuv_init:1; uint8_t is_direct_rendering_disabled:1; uint8_t cs_convert_init:1; + uint8_t assume_bad_field_picture:1; xine_bmiheader bih; unsigned char *buf; @@ -423,6 +421,9 @@ static void init_video_codec (ff_video_decoder_t *this, unsigned int codec_type) case BUF_VIDEO_HUFFYUV: this->frame_flags |= VO_INTERLACED_FLAG; break; + case BUF_VIDEO_H264: + this->frame_flags |= VO_INTERLACED_FLAG; + break; } } @@ -1155,7 +1156,6 @@ static void ff_handle_buffer (ff_video_decoder_t *this, buf_element_t *buf) { int offset = 0; int codec_type = buf->type & 0xFFFF0000; int video_step_to_use; - int frame_flags_to_use; /* pad input data */ /* note: bitstream, alt bitstream reader or something will cause @@ -1199,12 +1199,6 @@ static void ff_handle_buffer (ff_video_decoder_t *this, buf_element_t *buf) { /* use externally provided video_step or fall back to stream's time_base otherwise */ video_step_to_use = (this->video_step || !this->context->time_base.den) ? this->video_step : (int)(90000ll * this->context->time_base.num / this->context->time_base.den); - frame_flags_to_use = this->frame_flags; - - /* adjust frame flags for interlaced frames when running in demux_mpeg_pes context */ - if (!this->video_step && this->av_frame->interlaced_frame) - frame_flags_to_use |= VO_INTERLACED_FLAG; - /* aspect ratio provided by ffmpeg, override previous setting */ if ((this->aspect_ratio_prio < 2) && av_cmp_q(this->context->sample_aspect_ratio, avr00)) { @@ -1249,12 +1243,13 @@ static void ff_handle_buffer (ff_video_decoder_t *this, buf_element_t *buf) { set_stream_info(this); } + /* xine-lib expects the framesize to be a multiple of 16x16 (macroblock) */ img = this->stream->video_out->get_frame (this->stream->video_out, - this->bih.biWidth, - (this->bih.biHeight + 31) & ~31, + (this->bih.biWidth + 15) & ~15, + (this->bih.biHeight + 15) & ~15, this->aspect_ratio, this->output_format, - VO_BOTH_FIELDS|frame_flags_to_use); + VO_BOTH_FIELDS|this->frame_flags); free_img = 1; } else { /* DR1 */ @@ -1271,11 +1266,11 @@ static void ff_handle_buffer (ff_video_decoder_t *this, buf_element_t *buf) { if(this->av_frame->opaque) { /* DR1 */ img = this->stream->video_out->get_frame (this->stream->video_out, - img->width, - (img->height + 31) & ~31, + (img->width + 15) & ~15, + (img->height + 15) & ~15, this->aspect_ratio, this->output_format, - VO_BOTH_FIELDS|frame_flags_to_use); + VO_BOTH_FIELDS|this->frame_flags); free_img = 1; } @@ -1305,14 +1300,13 @@ static void ff_handle_buffer (ff_video_decoder_t *this, buf_element_t *buf) { else img->duration = video_step_to_use; - img->crop_right = this->crop_right; + /* additionally crop away the extra pixels due to adjusting frame size above */ + img->crop_right = this->crop_right + (img->width - this->bih.biWidth); img->crop_bottom = this->crop_bottom + (img->height - this->bih.biHeight); - /* transfer some more frame settings when running in demux_mpeg_pes context */ - if (!this->video_step) { - img->progressive_frame = !this->av_frame->interlaced_frame; - img->top_field_first = this->av_frame->top_field_first; - } + /* transfer some more frame settings for deinterlacing */ + img->progressive_frame = !this->av_frame->interlaced_frame; + img->top_field_first = this->av_frame->top_field_first; this->skipframes = img->draw(img, this->stream); @@ -1324,28 +1318,30 @@ static void ff_handle_buffer (ff_video_decoder_t *this, buf_element_t *buf) { /* workaround for demux_mpeg_pes sending fields as frames: * do not generate a bad frame for the first field picture */ - if (!got_one_picture && (this->size || this->video_step || !this->av_frame->interlaced_frame)) { - /* skipped frame, output a bad frame (of size 1x1 when size still uninitialized) */ + if (!got_one_picture && (this->size || this->video_step || this->assume_bad_field_picture)) { + /* skipped frame, output a bad frame (use size 16x16, when size still uninitialized) */ img = this->stream->video_out->get_frame (this->stream->video_out, - (this->bih.biWidth <= 0) ? 16 : this->bih.biWidth, - (this->bih.biHeight <= 0) ? 32 : this->bih.biHeight, + (this->bih.biWidth <= 0) ? 16 : ((this->bih.biWidth + 15) & ~15), + (this->bih.biHeight <= 0) ? 16 : ((this->bih.biHeight + 15) & ~15), this->aspect_ratio, this->output_format, - VO_BOTH_FIELDS|frame_flags_to_use); + VO_BOTH_FIELDS|this->frame_flags); /* set PTS to allow early syncing */ img->pts = this->pts; this->pts = 0; img->duration = video_step_to_use; - /* transfer some more frame settings when running in demux_mpeg_pes context */ - if (!this->video_step) { - img->progressive_frame = !this->av_frame->interlaced_frame; - img->top_field_first = this->av_frame->top_field_first; - } + + /* additionally crop away the extra pixels due to adjusting frame size above */ + img->crop_right = ((this->bih.biWidth <= 0) ? 0 : this->crop_right) + (img->width - this->bih.biWidth); + img->crop_bottom = ((this->bih.biHeight <= 0) ? 0 : this->crop_bottom) + (img->height - this->bih.biHeight); + img->bad_frame = 1; this->skipframes = img->draw(img, this->stream); img->free(img); } + + this->assume_bad_field_picture = !got_one_picture; } } diff --git a/src/libffmpeg/ffmpeg_decoder.c b/src/libffmpeg/ffmpeg_decoder.c index 86cae1c32..c0fb90e97 100644 --- a/src/libffmpeg/ffmpeg_decoder.c +++ b/src/libffmpeg/ffmpeg_decoder.c @@ -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: xine_decoder.c,v 1.173 2007/01/13 21:19:52 miguelfreitas Exp $ - * * xine decoder plugin using ffmpeg - * */ #ifdef HAVE_CONFIG_H diff --git a/src/libffmpeg/ffmpeg_decoder.h b/src/libffmpeg/ffmpeg_decoder.h index bc3ff3e9e..bfe71a6b1 100644 --- a/src/libffmpeg/ffmpeg_decoder.h +++ b/src/libffmpeg/ffmpeg_decoder.h @@ -16,9 +16,6 @@ * You 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 - * - * $Id: xine_decoder.h,v 1.7.2.1 2006/12/02 01:20:07 dgp85 Exp $ - * */ #ifndef HAVE_XINE_DECODER_H diff --git a/src/libffmpeg/ffmpeg_encoder.c b/src/libffmpeg/ffmpeg_encoder.c index 9e9800c1d..d9c4ccf5d 100644 --- a/src/libffmpeg/ffmpeg_encoder.c +++ b/src/libffmpeg/ffmpeg_encoder.c @@ -16,8 +16,6 @@ * You 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 - * - * $Id: xine_encoder.c,v 1.25 2006/07/10 22:08:29 dgp85 Exp $ */ /* mpeg encoders for the dxr3 video out plugin. */ diff --git a/src/libmpeg2/xine_mpeg2_decoder.c b/src/libmpeg2/xine_mpeg2_decoder.c index 8989e48f6..4c4cc8654 100644 --- a/src/libmpeg2/xine_mpeg2_decoder.c +++ b/src/libmpeg2/xine_mpeg2_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: xine_decoder.c,v 1.59 2006/07/10 22:08:29 dgp85 Exp $ - * * stuff needed to turn libmpeg2 into a xine decoder plugin */ diff --git a/src/libmpeg2new/xine_mpeg2new_decoder.c b/src/libmpeg2new/xine_mpeg2new_decoder.c index d16e97dbc..7ceac9178 100644 --- a/src/libmpeg2new/xine_mpeg2new_decoder.c +++ b/src/libmpeg2new/xine_mpeg2new_decoder.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: xine_decoder.c,v 1.22 2004/12/16 13:59:06 mroi Exp $ - * * stuff needed to turn libmpeg2 into a xine decoder plugin */ diff --git a/src/libreal/real_common.c b/src/libreal/real_common.c index 88036f169..fcd0fac8f 100644 --- a/src/libreal/real_common.c +++ b/src/libreal/real_common.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: real_common.c,v 1.12 2007/03/17 15:45:41 dgp85 Exp $ - * * Common function for the thin layer to use Real binary-only codecs in xine */ diff --git a/src/libreal/real_common.h b/src/libreal/real_common.h index 62758d435..1e3d8c264 100644 --- a/src/libreal/real_common.h +++ b/src/libreal/real_common.h @@ -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: real_common.h,v 1.7 2007/03/17 15:45:41 dgp85 Exp $ - * * Common function for the thin layer to use Real binary-only codecs in xine */ diff --git a/src/libreal/xine_real_audio_decoder.c b/src/libreal/xine_real_audio_decoder.c index 69bb596e4..1b21de2d0 100644 --- a/src/libreal/xine_real_audio_decoder.c +++ b/src/libreal/xine_real_audio_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: audio_decoder.c,v 1.59 2007/03/17 15:45:41 dgp85 Exp $ - * * thin layer to use real binary-only codecs in xine * * code inspired by work from Florian Schneider for the MPlayer Project diff --git a/src/libreal/xine_real_video_decoder.c b/src/libreal/xine_real_video_decoder.c index 2af79bb95..d68c7390e 100644 --- a/src/libreal/xine_real_video_decoder.c +++ b/src/libreal/xine_real_video_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: xine_decoder.c,v 1.93 2007/03/17 15:45:41 dgp85 Exp $ - * * thin layer to use real binary-only codecs in xine * * code inspired by work from Florian Schneider for the MPlayer Project diff --git a/src/libspucc/cc_decoder.c b/src/libspucc/cc_decoder.c index 1e7ab03b4..8d666e847 100644 --- a/src/libspucc/cc_decoder.c +++ b/src/libspucc/cc_decoder.c @@ -20,8 +20,6 @@ * along with this program; if not, write to the Free Software * 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 $ - * * stuff needed to provide closed captioning decoding and display * * Some small bits and pieces of the EIA-608 captioning decoder were diff --git a/src/libspucc/cc_decoder.h b/src/libspucc/cc_decoder.h index 5c1c68152..8698189a6 100644 --- a/src/libspucc/cc_decoder.h +++ b/src/libspucc/cc_decoder.h @@ -20,8 +20,6 @@ * along with this program; if not, write to the Free Software * 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 $ - * * stuff needed to provide closed captioning decoding and display * * Some small bits and pieces of the EIA-608 captioning decoder were diff --git a/src/libspucc/xine_cc_decoder.c b/src/libspucc/xine_cc_decoder.c index 7d592ef34..9cdb4c4ea 100644 --- a/src/libspucc/xine_cc_decoder.c +++ b/src/libspucc/xine_cc_decoder.c @@ -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: xine_decoder.c,v 1.34 2006/07/10 22:08:30 dgp85 Exp $ - * * closed caption spu decoder. receive data by events. - * */ #include <stdlib.h> diff --git a/src/libspucmml/xine_cmml_decoder.c b/src/libspucmml/xine_cmml_decoder.c index 63982e71d..b684d21cb 100644 --- a/src/libspucmml/xine_cmml_decoder.c +++ b/src/libspucmml/xine_cmml_decoder.c @@ -16,9 +16,6 @@ * You 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 - * - * $Id: xine_decoder.c,v 1.8 2006/07/10 22:08:30 dgp85 Exp $ - * */ #define LOG_MODULE "libspucmml" diff --git a/src/libspudec/spu.c b/src/libspudec/spu.c index 3818a393a..ce3497ef0 100644 --- a/src/libspudec/spu.c +++ b/src/libspudec/spu.c @@ -35,9 +35,6 @@ * You should have received a copy of the GNU General Public License * along with this program; see the file COPYING. If not, write to * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. - * - * $Id: spu.c,v 1.82 2005/09/25 00:44:04 miguelfreitas Exp $ - * */ #include <stdio.h> diff --git a/src/libspudec/spu.h b/src/libspudec/spu.h index 7e9aed3e8..8d92146f0 100644 --- a/src/libspudec/spu.h +++ b/src/libspudec/spu.h @@ -19,10 +19,7 @@ * along with this program; if not, write to the Free Software * 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 $ - * * This file was originally part of the OMS program. - * */ #ifndef __SPU_H__ diff --git a/src/libspudec/xine_spu_decoder.c b/src/libspudec/xine_spu_decoder.c index 177fff6f3..0ab91d906 100644 --- a/src/libspudec/xine_spu_decoder.c +++ b/src/libspudec/xine_spu_decoder.c @@ -19,8 +19,6 @@ * along with this program; if not, write to the Free Software * 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 $ - * * stuff needed to turn libspu into a xine decoder plugin */ diff --git a/src/libspudvb/xine_spudvb_decoder.c b/src/libspudvb/xine_spudvb_decoder.c index b5abbcecc..0f300138a 100644 --- a/src/libspudvb/xine_spudvb_decoder.c +++ b/src/libspudvb/xine_spudvb_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: xine_decoder.c,v 1.20 2006/07/10 22:08:30 dgp85 Exp $ - * * DVB Subtitle decoder (ETS 300 743) * (c) 2004 Mike Lampard <mlampard@users.sourceforge.net> * based on the application dvbsub by Dave Chapman diff --git a/src/libsputext/demux_sputext.c b/src/libsputext/demux_sputext.c index 14c6f2b42..502ef6580 100644 --- a/src/libsputext/demux_sputext.c +++ b/src/libsputext/demux_sputext.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: demux_sputext.c,v 1.53 2007/01/19 01:05:25 dgp85 Exp $ - * * code based on old libsputext/xine_decoder.c * * code based on mplayer module: diff --git a/src/libsputext/xine_sputext_decoder.c b/src/libsputext/xine_sputext_decoder.c index a6714c411..dabb2dddc 100644 --- a/src/libsputext/xine_sputext_decoder.c +++ b/src/libsputext/xine_sputext_decoder.c @@ -16,9 +16,6 @@ * You 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 - * - * $Id: xine_decoder.c,v 1.99 2007/02/20 01:04:07 dgp85 Exp $ - * */ #include <stdlib.h> 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. - * */ diff --git a/src/libxineadec/fooaudio.c b/src/libxineadec/fooaudio.c index 2174f1799..5ab4fa1f6 100644 --- a/src/libxineadec/fooaudio.c +++ b/src/libxineadec/fooaudio.c @@ -20,8 +20,6 @@ * 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 * place of the data it should actually send. - * - * $Id: fooaudio.c,v 1.18 2006/07/10 22:08:43 dgp85 Exp $ */ #include <stdio.h> diff --git a/src/libxineadec/gsm610.c b/src/libxineadec/gsm610.c index f54c56924..84d28cc3a 100644 --- a/src/libxineadec/gsm610.c +++ b/src/libxineadec/gsm610.c @@ -43,9 +43,6 @@ * Jutta Degener * Carsten Bormann * -------------------------------------------------------------------- - * - * $Id: gsm610.c,v 1.19 2006/07/10 22:08:43 dgp85 Exp $ - * */ #ifdef HAVE_CONFIG_H diff --git a/src/libxineadec/xine_a52_decoder.c b/src/libxineadec/xine_a52_decoder.c index 35e34eb57..bb4bdba29 100644 --- a/src/libxineadec/xine_a52_decoder.c +++ b/src/libxineadec/xine_a52_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: xine_decoder.c,v 1.81 2007/02/20 00:34:57 dgp85 Exp $ - * * stuff needed to turn liba52 into a xine decoder plugin */ diff --git a/src/libxineadec/xine_faad_decoder.c b/src/libxineadec/xine_faad_decoder.c index f9a16541d..4a2097ec4 100644 --- a/src/libxineadec/xine_faad_decoder.c +++ b/src/libxineadec/xine_faad_decoder.c @@ -16,9 +16,6 @@ * You 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 - * - * $Id: xine_decoder.c,v 1.49 2007/02/20 00:34:57 dgp85 Exp $ - * */ #include <stdlib.h> diff --git a/src/libxineadec/xine_mad_decoder.c b/src/libxineadec/xine_mad_decoder.c index 6b13052c5..2057505e8 100644 --- a/src/libxineadec/xine_mad_decoder.c +++ b/src/libxineadec/xine_mad_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: xine_decoder.c,v 1.57 2006/07/10 22:08:29 dgp85 Exp $ - * * stuff needed to turn libmad into a xine decoder plugin */ diff --git a/src/libxinevdec/bitplane.c b/src/libxinevdec/bitplane.c index 6e982d671..b6940813f 100644 --- a/src/libxinevdec/bitplane.c +++ b/src/libxinevdec/bitplane.c @@ -27,8 +27,6 @@ * - IFF ANIM compression methods OPT 5, 7 (long and short) and * 8 (long and short) * - untested (found no testfiles) IFF-ANIM OPT 3, 4 and 6 - * - * $Id: bitplane.c,v 1.15 2006/07/10 22:08:43 dgp85 Exp $ */ #include <stdio.h> diff --git a/src/libxinevdec/foovideo.c b/src/libxinevdec/foovideo.c index 4af8b7c73..98e0ebc0b 100644 --- a/src/libxinevdec/foovideo.c +++ b/src/libxinevdec/foovideo.c @@ -22,8 +22,6 @@ * where each byte in the map is the same value, which is 3 larger than the * value from the last frame. This creates a slowly rotating solid color * frame when the frames are played in succession. - * - * $Id: foovideo.c,v 1.26 2006/07/10 22:08:43 dgp85 Exp $ */ #include <stdio.h> diff --git a/src/libxinevdec/gdkpixbuf.c b/src/libxinevdec/gdkpixbuf.c index 837ca1fbd..b5acdfa42 100644 --- a/src/libxinevdec/gdkpixbuf.c +++ b/src/libxinevdec/gdkpixbuf.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: gdkpixbuf.c,v 1.7 2006/08/05 13:31:13 hadess Exp $ - * * a gdk-pixbuf-based image video decoder */ diff --git a/src/libxinevdec/image.c b/src/libxinevdec/image.c index 42417c726..a338e3cab 100644 --- a/src/libxinevdec/image.c +++ b/src/libxinevdec/image.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: image.c,v 1.21 2006/10/16 22:18:24 valtri Exp $ - * * a image video decoder */ diff --git a/src/libxinevdec/rgb.c b/src/libxinevdec/rgb.c index fd6e2739c..0e7be4c18 100644 --- a/src/libxinevdec/rgb.c +++ b/src/libxinevdec/rgb.c @@ -29,8 +29,6 @@ * * One more catch: Raw RGB from a Microsoft file is upside down. This is * indicated by a negative height parameter. - * - * $Id: rgb.c,v 1.34 2006/07/10 22:08:43 dgp85 Exp $ */ #include <stdio.h> diff --git a/src/libxinevdec/yuv.c b/src/libxinevdec/yuv.c index 3a4814bdc..2b8657685 100644 --- a/src/libxinevdec/yuv.c +++ b/src/libxinevdec/yuv.c @@ -20,8 +20,6 @@ * YUV "Decoder" by Mike Melanson (melanson@pcisys.net) * Actually, this decoder just reorganizes chunks of raw YUV data in such * a way that xine can display them. - * - * $Id: yuv.c,v 1.37 2006/07/10 22:08:43 dgp85 Exp $ */ #include <stdio.h> diff --git a/src/post/audio/audio_filters.c b/src/post/audio/audio_filters.c index 68c48a479..8200db51b 100644 --- a/src/post/audio/audio_filters.c +++ b/src/post/audio/audio_filters.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: audio_filters.c,v 1.7 2006/07/10 22:08:44 dgp85 Exp $ - * * catalog for audio filter plugins */ diff --git a/src/post/audio/audio_filters.h b/src/post/audio/audio_filters.h index ced5e27b7..6c064945a 100644 --- a/src/post/audio/audio_filters.h +++ b/src/post/audio/audio_filters.h @@ -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: audio_filters.h,v 1.3 2006/02/05 20:38:37 miguelfreitas Exp $ - * * catalog for audio filter plugins */ diff --git a/src/post/audio/stretch.c b/src/post/audio/stretch.c index d8b174b4f..5aa7a0617 100644 --- a/src/post/audio/stretch.c +++ b/src/post/audio/stretch.c @@ -18,9 +18,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * Time stretch by a given factor, optionally preserving pitch - * - * $Id: stretch.c,v 1.8 2006/01/27 07:46:12 tmattern Exp $ - * */ #include <stdio.h> diff --git a/src/post/audio/upmix.c b/src/post/audio/upmix.c index fe8c4a762..e1b2afbe3 100644 --- a/src/post/audio/upmix.c +++ b/src/post/audio/upmix.c @@ -22,9 +22,6 @@ * This is an up-mix audio filter post plugin. * It simply creates output channels to match the speaker arrangement. * E.g. Converts Stereo into Surround 5.1 - * - * $Id: upmix.c,v 1.17 2006/01/27 07:46:12 tmattern Exp $ - * */ #include <stdio.h> diff --git a/src/post/audio/upmix_mono.c b/src/post/audio/upmix_mono.c index c6f53acb2..195831123 100644 --- a/src/post/audio/upmix_mono.c +++ b/src/post/audio/upmix_mono.c @@ -21,9 +21,6 @@ * (c) 2004 James Courtier-Dutton (James@superbug.demon.co.uk) * This is an up-mix audio filter post plugin. * It simply converts Mono into Stereo. - * - * $Id: upmix_mono.c,v 1.5 2006/01/27 07:46:12 tmattern Exp $ - * */ #include <stdio.h> diff --git a/src/post/audio/volnorm.c b/src/post/audio/volnorm.c index 866dd87ae..783c1e26d 100644 --- a/src/post/audio/volnorm.c +++ b/src/post/audio/volnorm.c @@ -20,9 +20,6 @@ * Volume normalization audio filter for xine. Ported by Jason Tackaberry * from MPlayer's af_volnorm, which is copyright 2004 by Alex Beregszaszi * & Pierre Lombard. - * - * $Id: volnorm.c,v 1.1 2006/02/05 20:38:37 miguelfreitas Exp $ - * */ #include <stdio.h> diff --git a/src/post/deinterlace/plugins/greedy2frame_template.c b/src/post/deinterlace/plugins/greedy2frame_template.c index 728bceed5..1067e2cb8 100644 --- a/src/post/deinterlace/plugins/greedy2frame_template.c +++ b/src/post/deinterlace/plugins/greedy2frame_template.c @@ -1,6 +1,4 @@ /***************************************************************************** -** $Id: greedy2frame_template.c,v 1.10 2006/12/21 09:54:45 dgp85 Exp $ -****************************************************************************** ** Copyright (c) 2000 John Adcock, Tom Barry, Steve Grimm All rights reserved. ** port copyright (c) 2003 Miguel Freitas ****************************************************************************** @@ -18,7 +16,6 @@ ****************************************************************************** ** CVS Log ** -** $Log: greedy2frame_template.c,v $ ** Revision 1.10 2006/12/21 09:54:45 dgp85 ** Apply the textrel patch from Gentoo, thanks to PaX team for providing it. The patch was applied and tested for a while in Gentoo and Pardus, and solves also Debian's problems with non-PIC code. If problems will arise, they'll be debugged. ** diff --git a/src/post/deinterlace/xine_plugin.c b/src/post/deinterlace/xine_plugin.c index de3d3a4e7..99bd597f6 100644 --- a/src/post/deinterlace/xine_plugin.c +++ b/src/post/deinterlace/xine_plugin.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: xine_plugin.c,v 1.52 2006/07/12 21:08:46 dsalt Exp $ - * * advanced video deinterlacer plugin * Jun/2003 by Miguel Freitas * diff --git a/src/post/goom/xine_goom.c b/src/post/goom/xine_goom.c index 05095dc95..351c997ba 100644 --- a/src/post/goom/xine_goom.c +++ b/src/post/goom/xine_goom.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: xine_goom.c,v 1.65 2007/02/20 00:58:51 dgp85 Exp $ - * * GOOM post plugin. * * first version by Mark Thomas diff --git a/src/post/mosaico/mosaico.c b/src/post/mosaico/mosaico.c index 51bf8e5b0..05c1f5f19 100644 --- a/src/post/mosaico/mosaico.c +++ b/src/post/mosaico/mosaico.c @@ -16,8 +16,6 @@ * You 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 - * - * $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 6c584d368..8fec5ee77 100644 --- a/src/post/mosaico/switch.c +++ b/src/post/mosaico/switch.c @@ -16,8 +16,6 @@ * You 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 - * - * $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 e84329ba1..b7a6f524f 100644 --- a/src/post/planar/boxblur.c +++ b/src/post/planar/boxblur.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: boxblur.c,v 1.14 2006/01/27 07:46:14 tmattern Exp $ - * * mplayer's boxblur * Copyright (C) 2002 Michael Niedermayer <michaelni@gmx.at> */ diff --git a/src/post/planar/denoise3d.c b/src/post/planar/denoise3d.c index 9c457bb49..fb3c1102b 100644 --- a/src/post/planar/denoise3d.c +++ b/src/post/planar/denoise3d.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: denoise3d.c,v 1.14 2006/01/27 07:46:14 tmattern Exp $ - * * mplayer's denoise3d * Copyright (C) 2003 Daniel Moreno <comac@comac.darktech.org> */ diff --git a/src/post/planar/eq.c b/src/post/planar/eq.c index ddd8a5392..b2cf6e50f 100644 --- a/src/post/planar/eq.c +++ b/src/post/planar/eq.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: eq.c,v 1.15 2007/03/22 23:32:05 dgp85 Exp $ - * * mplayer's eq (soft video equalizer) * Copyright (C) Richard Felker */ diff --git a/src/post/planar/eq2.c b/src/post/planar/eq2.c index 63dc44495..6b277c347 100644 --- a/src/post/planar/eq2.c +++ b/src/post/planar/eq2.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: eq2.c,v 1.18 2007/03/22 23:32:05 dgp85 Exp $ - * * mplayer's eq2 (soft video equalizer) * Software equalizer (brightness, contrast, gamma, saturation) * diff --git a/src/post/planar/fill.c b/src/post/planar/fill.c index c9e1722fa..32a9d5dfb 100644 --- a/src/post/planar/fill.c +++ b/src/post/planar/fill.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: fill.c,v 1.1 2005/07/18 18:02:51 jstembridge Exp $ - * * fill video filter by James Stembridge (jstembridge@gmail.com) * * based on invert.c - * */ #include "xine_internal.h" diff --git a/src/post/planar/invert.c b/src/post/planar/invert.c index 2907c0e80..1aa5c2a2e 100644 --- a/src/post/planar/invert.c +++ b/src/post/planar/invert.c @@ -16,8 +16,6 @@ * You 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 - * - * $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 7973240f2..8c04f2e72 100644 --- a/src/post/planar/noise.c +++ b/src/post/planar/noise.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: noise.c,v 1.4 2007/03/22 23:32:05 dgp85 Exp $ - * * mplayer's noise filter, ported by Jason Tackaberry. Original filter * is copyright 2002 Michael Niedermayer <michaelni@gmx.at> */ diff --git a/src/post/planar/planar.c b/src/post/planar/planar.c index 8a3faddb9..5907d58e5 100644 --- a/src/post/planar/planar.c +++ b/src/post/planar/planar.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: planar.c,v 1.13 2006/07/10 22:08:44 dgp85 Exp $ - * * catalog for planar post plugins */ diff --git a/src/post/planar/pp.c b/src/post/planar/pp.c index b1f32f47f..e13119311 100755..100644 --- a/src/post/planar/pp.c +++ b/src/post/planar/pp.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: pp.c,v 1.9 2006/01/27 07:46:14 tmattern Exp $ - * * plugin for ffmpeg libpostprocess */ diff --git a/src/post/planar/unsharp.c b/src/post/planar/unsharp.c index b8f52cac9..b9b791a8e 100644 --- a/src/post/planar/unsharp.c +++ b/src/post/planar/unsharp.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: unsharp.c,v 1.18 2006/01/27 07:46:14 tmattern Exp $ - * * mplayer's unsharp * Copyright (C) 2002 Rémi Guyomarch <rguyom@pobox.com> */ diff --git a/src/post/visualizations/fftgraph.c b/src/post/visualizations/fftgraph.c index dad1c033d..5068bd37a 100644 --- a/src/post/visualizations/fftgraph.c +++ b/src/post/visualizations/fftgraph.c @@ -19,9 +19,6 @@ * * FftGraph Visualization Post Plugin For xine * by Thibaut Mattern (tmattern@noos.fr) - * - * $Id: fftgraph.c,v 1.15 2006/12/02 22:35:18 miguelfreitas Exp $ - * */ #include <stdio.h> diff --git a/src/post/visualizations/fftscope.c b/src/post/visualizations/fftscope.c index 4c7d41dde..ba34437f5 100644 --- a/src/post/visualizations/fftscope.c +++ b/src/post/visualizations/fftscope.c @@ -21,9 +21,6 @@ * by Mike Melanson (melanson@pcisys.net) * * FFT code by Steve Haehnichen, originally licensed under GPL v1 - * - * $Id: fftscope.c,v 1.30 2006/12/02 22:35:18 miguelfreitas Exp $ - * */ #include <stdio.h> diff --git a/src/post/visualizations/fooviz.c b/src/post/visualizations/fooviz.c index c287408e9..21854afc6 100644 --- a/src/post/visualizations/fooviz.c +++ b/src/post/visualizations/fooviz.c @@ -22,9 +22,6 @@ * This is an example/template for the xine visualization post plugin * process. It simply paints the screen a solid color and rotates through * colors on each iteration. - * - * $Id: fooviz.c,v 1.28 2006/12/02 22:35:18 miguelfreitas Exp $ - * */ #include <stdio.h> diff --git a/src/post/visualizations/oscope.c b/src/post/visualizations/oscope.c index b96962fb9..a435604d4 100644 --- a/src/post/visualizations/oscope.c +++ b/src/post/visualizations/oscope.c @@ -19,9 +19,6 @@ * * Basic Oscilloscope Visualization Post Plugin For xine * by Mike Melanson (melanson@pcisys.net) - * - * $Id: oscope.c,v 1.21 2006/12/02 22:35:18 miguelfreitas Exp $ - * */ #include <stdio.h> diff --git a/src/post/visualizations/visualizations.c b/src/post/visualizations/visualizations.c index 72180a67b..a26f0bd5b 100644 --- a/src/post/visualizations/visualizations.c +++ b/src/post/visualizations/visualizations.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * This file contains plugin entries for several visualization post plugins. - * - * $Id: visualizations.c,v 1.14 2006/07/10 22:08:44 dgp85 Exp $ */ #ifdef HAVE_CONFIG_H diff --git a/src/post/visualizations/visualizations.h b/src/post/visualizations/visualizations.h index c6ea96f1d..39d02e1cb 100644 --- a/src/post/visualizations/visualizations.h +++ b/src/post/visualizations/visualizations.h @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * This file contains plugin entries for several visualization post plugins. - * - * $Id: visualizations.h,v 1.1 2003/10/30 22:40:53 mroi Exp $ */ #include "xine_internal.h" diff --git a/src/vdr/input_vdr.c b/src/vdr/input_vdr.c index 3ba75644e..5722a536f 100644 --- a/src/vdr/input_vdr.c +++ b/src/vdr/input_vdr.c @@ -16,8 +16,6 @@ * You 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 - * - * $Id: input_vdr.c,v 1.51 2003/05/02 15:02:11 miguelfreitas Exp $ */ #ifdef HAVE_CONFIG_H diff --git a/src/vdr/input_vdr.h b/src/vdr/input_vdr.h index a6bb6791f..41c96d741 100644 --- a/src/vdr/input_vdr.h +++ b/src/vdr/input_vdr.h @@ -1,3 +1,22 @@ +/* + * Copyright (C) 2000-2004 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 + */ #ifndef __INPUT_VDR_H #define __INPUT_VDR_H diff --git a/src/vdr/post_vdr.c b/src/vdr/post_vdr.c index 7e01854e0..58386d344 100644 --- a/src/vdr/post_vdr.c +++ b/src/vdr/post_vdr.c @@ -16,8 +16,6 @@ * You 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 - * - * $Id: vdr.c,v 1.20 2004/04/17 19:54:32 mroi Exp $ */ /* diff --git a/src/vdr/post_vdr.h b/src/vdr/post_vdr.h index 7684727eb..b16a2d2df 100644 --- a/src/vdr/post_vdr.h +++ b/src/vdr/post_vdr.h @@ -1,3 +1,22 @@ +/* + * Copyright (C) 2000-2004 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 + */ #ifndef __POST_VDR_H #define __POST_VDR_H diff --git a/src/vdr/post_vdr_audio.c b/src/vdr/post_vdr_audio.c index ddac6c3da..9248e9c45 100644 --- a/src/vdr/post_vdr_audio.c +++ b/src/vdr/post_vdr_audio.c @@ -16,8 +16,6 @@ * You 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 - * - * $Id: vdr.c,v 1.20 2004/04/17 19:54:32 mroi Exp $ */ /* diff --git a/src/vdr/post_vdr_video.c b/src/vdr/post_vdr_video.c index 949af5716..85536819a 100644 --- a/src/vdr/post_vdr_video.c +++ b/src/vdr/post_vdr_video.c @@ -16,8 +16,6 @@ * You 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 - * - * $Id: vdr.c,v 1.20 2004/04/17 19:54:32 mroi Exp $ */ /* diff --git a/src/video_out/video_out_aa.c b/src/video_out/video_out_aa.c index aba801e1b..012db9665 100644 --- a/src/video_out/video_out_aa.c +++ b/src/video_out/video_out_aa.c @@ -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: video_out_aa.c,v 1.49 2006/07/10 22:08:44 dgp85 Exp $ - * * video_out_aa.c, ascii-art output plugin for xine - * */ #ifdef HAVE_CONFIG_H diff --git a/src/video_out/video_out_caca.c b/src/video_out/video_out_caca.c index 3dbf02daa..866eabcd8 100644 --- a/src/video_out/video_out_caca.c +++ b/src/video_out/video_out_caca.c @@ -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: video_out_caca.c,v 1.9 2006/09/14 00:44:19 dgp85 Exp $ - * * video_out_caca.c, Color AsCii Art output plugin for xine - * */ #ifdef HAVE_CONFIG_H diff --git a/src/video_out/video_out_directfb.c b/src/video_out/video_out_directfb.c index 523da11c1..1ab1fb8e8 100644 --- a/src/video_out/video_out_directfb.c +++ b/src/video_out/video_out_directfb.c @@ -1663,13 +1663,13 @@ static DFBResult init_device (directfb_driver_t *this) { if (this->visual_type == XINE_VISUAL_TYPE_FB) { this->underlay->SetCooperativeLevel (this->underlay, DLSCL_EXCLUSIVE); - this->underlay->SetBackgroundMode( this->underlay, DLBM_DONTCARE); + this->underlay->SetConfiguration (this->underlay, &config); } } } else { /* playing to underlay, - * check if stretchblit is hardware accelerated. */ + * check whether stretchblit is hardware accelerated. */ IDirectFBSurface *temp; DFBSurfaceDescription dsc; DFBAccelerationMask mask = DFXL_NONE; diff --git a/src/video_out/video_out_directx.c b/src/video_out/video_out_directx.c index 0928af12e..11ee709e1 100755..100644 --- a/src/video_out/video_out_directx.c +++ b/src/video_out/video_out_directx.c @@ -19,8 +19,6 @@ * * video_out_directx.c, direct draw video output plugin for xine * by Matthew Grooms <elon@altavista.com> - * - * $Id: video_out_directx.c,v 1.31 2006/07/10 22:08:44 dgp85 Exp $ */ typedef unsigned char boolean; diff --git a/src/video_out/video_out_fb.c b/src/video_out/video_out_fb.c index 0b04acf3d..08663ae61 100644 --- a/src/video_out/video_out_fb.c +++ b/src/video_out/video_out_fb.c @@ -16,8 +16,6 @@ * You 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 - * - * $Id: video_out_fb.c,v 1.49 2006/12/19 19:10:51 dsalt Exp $ */ /** @@ -1091,3 +1089,4 @@ const plugin_info_t xine_plugin_info[] EXPORTED = { { PLUGIN_VIDEO_OUT, 21, "fb", XINE_VERSION_CODE, &vo_info_fb, fb_init_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; + diff --git a/src/video_out/video_out_macosx.m b/src/video_out/video_out_macosx.m index 845bd9b94..4621d31b9 100644 --- a/src/video_out/video_out_macosx.m +++ b/src/video_out/video_out_macosx.m @@ -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: video_out_macosx.m,v 1.15 2006/06/02 22:18:58 dsalt Exp $ - * * This output driver makes use of xine's objective-c video_output * classes located in the macosx folder. */ diff --git a/src/video_out/video_out_none.c b/src/video_out/video_out_none.c index ca3147839..5f2424a60 100644 --- a/src/video_out/video_out_none.c +++ b/src/video_out/video_out_none.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: video_out_none.c,v 1.27 2006/07/10 22:08:44 dgp85 Exp $ - * * Was originally part of toxine frontend. * ...but has now been adapted to xine coding style standards ;) * ......what changes, impressive! diff --git a/src/video_out/video_out_opengl.c b/src/video_out/video_out_opengl.c index 78b8be7e3..54696f452 100644 --- a/src/video_out/video_out_opengl.c +++ b/src/video_out/video_out_opengl.c @@ -17,13 +17,10 @@ * along with this program; if not, write to the Free Software * 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 $ - * * video_out_opengl.c, OpenGL based interface for xine * * Written by Matthias Hopf <mat@mshopf.de>, * based on the xshm and xv video output plugins. - * */ /* #define LOG */ diff --git a/src/video_out/video_out_pgx32.c b/src/video_out/video_out_pgx32.c index 7536d3359..d903efc89 100644 --- a/src/video_out/video_out_pgx32.c +++ b/src/video_out/video_out_pgx32.c @@ -17,13 +17,10 @@ * along with this program; if not, write to the Free Software * 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 $ - * * video_out_pgx32.c, Sun PGX32 output plugin for xine * * written and currently maintained by * Robin Kay <komadori [at] gekkou [dot] co [dot] uk> - * */ #ifdef HAVE_CONFIG_H diff --git a/src/video_out/video_out_pgx64.c b/src/video_out/video_out_pgx64.c index 8533b6b6d..4abb794d7 100644 --- a/src/video_out/video_out_pgx64.c +++ b/src/video_out/video_out_pgx64.c @@ -17,15 +17,12 @@ * along with this program; if not, write to the Free Software * 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 $ - * * video_out_pgx64.c, Sun XVR100/PGX64/PGX24 output plugin for xine * * written and currently maintained by * Robin Kay <komadori [at] gekkou [dot] co [dot] uk> * * Sun XVR-100 framebuffer graciously donated by Jake Goerzen. - * */ #ifdef HAVE_CONFIG_H diff --git a/src/video_out/video_out_sdl.c b/src/video_out/video_out_sdl.c index 25d417a11..f4f645e8c 100644 --- a/src/video_out/video_out_sdl.c +++ b/src/video_out/video_out_sdl.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: video_out_sdl.c,v 1.48 2006/07/10 22:08:44 dgp85 Exp $ - * * video_out_sdl.c, Simple DirectMedia Layer * * based on mpeg2dec code from diff --git a/src/video_out/video_out_stk.c b/src/video_out/video_out_stk.c index a04b12584..dfc4ae385 100644 --- a/src/video_out/video_out_stk.c +++ b/src/video_out/video_out_stk.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: video_out_stk.c,v 1.19 2006/07/10 22:08:44 dgp85 Exp $ - * * video_out_stk.c, Libstk Surface Video Driver * more info on Libstk at http://www.libstk.org * diff --git a/src/video_out/video_out_syncfb.c b/src/video_out/video_out_syncfb.c index 76919b75e..86be3422e 100644 --- a/src/video_out/video_out_syncfb.c +++ b/src/video_out/video_out_syncfb.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: video_out_syncfb.c,v 1.108 2006/12/19 19:10:51 dsalt Exp $ - * * video_out_syncfb.c, SyncFB (for Matrox G200/G400 cards) interface for xine * * based on video_out_xv.c by (see file for original authors) diff --git a/src/video_out/video_out_vidix.c b/src/video_out/video_out_vidix.c index 1a8ee43d3..21e361d93 100644 --- a/src/video_out/video_out_vidix.c +++ b/src/video_out/video_out_vidix.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: video_out_vidix.c,v 1.75 2006/12/19 19:10:51 dsalt Exp $ - * * video_out_vidix.c * * xine video_out driver to vidix library by Miguel Freitas 30/05/2002 @@ -26,7 +24,6 @@ * based on video_out_xv.c, video_out_syncfb.c and video_out_pgx64.c * * some vidix specific code from mplayer (file vosub_vidix.c) - * */ #ifdef HAVE_CONFIG_H diff --git a/src/video_out/video_out_xcbshm.c b/src/video_out/video_out_xcbshm.c index d18f49ec4..5de8a4fd3 100644 --- a/src/video_out/video_out_xcbshm.c +++ b/src/video_out/video_out_xcbshm.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: video_out_xcbshm.c,v 1.3 2007/03/25 23:13:53 dgp85 Exp $ - * * video_out_xcbshm.c, X11 shared memory extension interface for xine * * based on mpeg2dec code from diff --git a/src/video_out/video_out_xcbxv.c b/src/video_out/video_out_xcbxv.c index a4716aa43..dd19172cf 100644 --- a/src/video_out/video_out_xcbxv.c +++ b/src/video_out/video_out_xcbxv.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: video_out_xcbxv.c,v 1.6 2007/03/29 18:58:21 dgp85 Exp $ - * * video_out_xcbxv.c, X11 video extension interface for xine * * based on mpeg2dec code from diff --git a/src/video_out/video_out_xshm.c b/src/video_out/video_out_xshm.c index eeaebf287..40986899a 100644 --- a/src/video_out/video_out_xshm.c +++ b/src/video_out/video_out_xshm.c @@ -17,15 +17,12 @@ * along with this program; if not, write to the Free Software * 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 $ - * * video_out_xshm.c, X11 shared memory extension interface for xine * * based on mpeg2dec code from * Aaron Holtzman <aholtzma@ess.engr.uvic.ca> * * xine-specific code by Guenter Bartsch <bartscgr@studbox.uni-stuttgart.de> - * */ #ifdef HAVE_CONFIG_H diff --git a/src/video_out/video_out_xv.c b/src/video_out/video_out_xv.c index 9c5e6f861..a082c9d19 100644 --- a/src/video_out/video_out_xv.c +++ b/src/video_out/video_out_xv.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: video_out_xv.c,v 1.224 2007/03/29 19:01:03 dgp85 Exp $ - * * video_out_xv.c, X11 video extension interface for xine * * based on mpeg2dec code from diff --git a/src/video_out/video_out_xvmc.c b/src/video_out/video_out_xvmc.c index 8b2ca79ea..3ff30fa25 100644 --- a/src/video_out/video_out_xvmc.c +++ b/src/video_out/video_out_xvmc.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: video_out_xvmc.c,v 1.29 2007/03/25 23:07:23 dgp85 Exp $ - * * video_out_xvmc.c, X11 video motion compensation extension interface for xine * * based on mpeg2dec code from diff --git a/src/video_out/video_out_xxmc.c b/src/video_out/video_out_xxmc.c index 8477a22c3..d4c43ab37 100644 --- a/src/video_out/video_out_xxmc.c +++ b/src/video_out/video_out_xxmc.c @@ -18,8 +18,6 @@ * along with this program; if not, write to the Free Software * 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 $ - * * video_out_xxmc.c, X11 decoding accelerated video extension interface for xine * * based on mpeg2dec code from @@ -33,7 +31,6 @@ * X11 unscaled overlay support by Miguel Freitas - Nov 2003 * XvMC VLD implementation by Thomas Hellström - 2004, 2005. * XvMC merge by Thomas Hellström - Sep 2004 - * */ diff --git a/src/video_out/x11osd.c b/src/video_out/x11osd.c index 3b505ead5..e0cb6f1f6 100644 --- a/src/video_out/x11osd.c +++ b/src/video_out/x11osd.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: x11osd.c,v 1.15 2005/09/25 00:44:04 miguelfreitas Exp $ - * * x11osd.c, use X11 Nonrectangular Window Shape Extension to draw xine OSD * * Nov 2003 - Miguel Freitas diff --git a/src/video_out/x11osd.h b/src/video_out/x11osd.h index 45aae22f8..fe0bf6208 100644 --- a/src/video_out/x11osd.h +++ b/src/video_out/x11osd.h @@ -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: x11osd.h,v 1.4 2004/04/10 15:31:10 miguelfreitas Exp $ - * * x11osd.h, use X11 Nonrectangular Window Shape Extension to draw xine OSD * * Nov 2003 - Miguel Freitas diff --git a/src/video_out/xcbosd.c b/src/video_out/xcbosd.c index 06e29bf32..4bb2b60af 100644 --- a/src/video_out/xcbosd.c +++ b/src/video_out/xcbosd.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: xcbosd.c,v 1.1 2007/02/15 15:19:33 dgp85 Exp $ - * * xcbosd.c, use X11 Nonrectangular Window Shape Extension to draw xine OSD * * Nov 2003 - Miguel Freitas diff --git a/src/video_out/xcbosd.h b/src/video_out/xcbosd.h index 89540e846..32af4965e 100644 --- a/src/video_out/xcbosd.h +++ b/src/video_out/xcbosd.h @@ -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: xcbosd.h,v 1.1 2007/02/15 15:19:33 dgp85 Exp $ - * * xcbosd.h, use X11 Nonrectangular Window Shape Extension to draw xine OSD * * Nov 2003 - Miguel Freitas diff --git a/src/video_out/xvmc_mocomp.c b/src/video_out/xvmc_mocomp.c index 18b8f6121..bd7e4e163 100644 --- a/src/video_out/xvmc_mocomp.c +++ b/src/video_out/xvmc_mocomp.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: xvmc_mocomp.c,v 1.4 2005/05/06 07:42:21 totte67 Exp $ - * * XvMC image support by Jack Kelliher */ diff --git a/src/video_out/xvmc_vld.c b/src/video_out/xvmc_vld.c index 6b6757908..57f276665 100644 --- a/src/video_out/xvmc_vld.c +++ b/src/video_out/xvmc_vld.c @@ -18,8 +18,6 @@ * along with this program; if not, write to the Free Software * 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 $ - * * xvmc_vld.c, X11 decoding accelerated video extension interface for xine * * Author: Thomas Hellström, (2004) diff --git a/src/video_out/xxmc.h b/src/video_out/xxmc.h index 920ee5c43..84964af17 100644 --- a/src/video_out/xxmc.h +++ b/src/video_out/xxmc.h @@ -18,8 +18,6 @@ * along with this program; if not, write to the Free Software * 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 $ - * * video_out_xxmc.c, X11 decoding accelerated video extension interface for xine * * based on mpeg2dec code from diff --git a/src/video_out/yuv2rgb.c b/src/video_out/yuv2rgb.c index 62b332c33..0ca6537a7 100644 --- a/src/video_out/yuv2rgb.c +++ b/src/video_out/yuv2rgb.c @@ -22,8 +22,6 @@ * You 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 - * - * $Id: yuv2rgb.c,v 1.52 2006/06/20 01:07:59 dgp85 Exp $ */ #include "config.h" diff --git a/src/xine-engine/accel_xvmc.h b/src/xine-engine/accel_xvmc.h index 3e7078f6f..993f914bf 100644 --- a/src/xine-engine/accel_xvmc.h +++ b/src/xine-engine/accel_xvmc.h @@ -18,8 +18,6 @@ * along with this program; if not, write to the Free Software * 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 $ - * * * Common acceleration definitions for XvMC. * diff --git a/src/xine-engine/audio_decoder.c b/src/xine-engine/audio_decoder.c index cdfe9858f..5476262d9 100644 --- a/src/xine-engine/audio_decoder.c +++ b/src/xine-engine/audio_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: audio_decoder.c,v 1.139 2007/02/20 00:34:57 dgp85 Exp $ - * * * functions that implement audio decoding */ diff --git a/src/xine-engine/audio_decoder.h b/src/xine-engine/audio_decoder.h index 84d579efb..8f75ba242 100644 --- a/src/xine-engine/audio_decoder.h +++ b/src/xine-engine/audio_decoder.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: audio_decoder.h,v 1.13 2004/09/26 22:54:52 valtri Exp $ - * * xine audio decoder plugin interface - * */ #ifndef HAVE_AUDIO_DECODER_H diff --git a/src/xine-engine/audio_out.c b/src/xine-engine/audio_out.c index f50118c60..288e27672 100644 --- a/src/xine-engine/audio_out.c +++ b/src/xine-engine/audio_out.c @@ -55,7 +55,6 @@ * Copyright (C) 2002 Felipe Rivera <liebremx at users sourceforge net> * * heavily modified by guenter bartsch 2003 for use in libxine - * */ #ifndef __sun diff --git a/src/xine-engine/audio_out.h b/src/xine-engine/audio_out.h index 8cd81d7a9..6ead6505e 100644 --- a/src/xine-engine/audio_out.h +++ b/src/xine-engine/audio_out.h @@ -16,8 +16,6 @@ * You 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 - * - * $Id: audio_out.h,v 1.77 2006/09/26 05:19:48 dgp85 Exp $ */ #ifndef HAVE_AUDIO_OUT_H #define HAVE_AUDIO_OUT_H diff --git a/src/xine-engine/broadcaster.c b/src/xine-engine/broadcaster.c index 8e77c6711..1d2f01366 100644 --- a/src/xine-engine/broadcaster.c +++ b/src/xine-engine/broadcaster.c @@ -19,8 +19,6 @@ * along with this program; if not, write to the Free Software * 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 $ - * * broadcaster.c - xine network broadcaster * * how it works: @@ -32,7 +30,6 @@ * - streams played on master will appear on every slave. * if master is not meant to use video/audio devices it may be started with * 'xine -V none -A none' - * */ #include <stdio.h> diff --git a/src/xine-engine/broadcaster.h b/src/xine-engine/broadcaster.h index 1e910f924..093fb4af0 100644 --- a/src/xine-engine/broadcaster.h +++ b/src/xine-engine/broadcaster.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: broadcaster.h,v 1.3 2006/09/26 05:19:48 dgp85 Exp $ - * * broadcaster.h - * */ #ifndef HAVE_BROADCASTER_H diff --git a/src/xine-engine/buffer.c b/src/xine-engine/buffer.c index c595e547c..93ad75ba0 100644 --- a/src/xine-engine/buffer.c +++ b/src/xine-engine/buffer.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: buffer.c,v 1.37 2006/12/25 21:59:32 dgp85 Exp $ - * * * contents: * @@ -28,7 +26,6 @@ * free buffer pool management routines * * FIFO buffer structures/routines - * */ #ifdef HAVE_CONFIG_H diff --git a/src/xine-engine/buffer.h b/src/xine-engine/buffer.h index 5ad048084..20579f12d 100644 --- a/src/xine-engine/buffer.h +++ b/src/xine-engine/buffer.h @@ -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: buffer.h,v 1.162 2007/01/14 16:53:37 klan Exp $ - * * * contents: * @@ -28,7 +26,6 @@ * free buffer pool management routines * * FIFO buffer structures/routines - * */ #ifndef HAVE_BUFFER_H diff --git a/src/xine-engine/buffer_types.c b/src/xine-engine/buffer_types.c index 91e1d38d8..827394374 100644 --- a/src/xine-engine/buffer_types.c +++ b/src/xine-engine/buffer_types.c @@ -17,14 +17,11 @@ * along with this program; if not, write to the Free Software * 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 $ - * * * contents: * * buffer types management. * convert FOURCC and audioformattag to BUF_xxx defines - * */ #ifdef HAVE_CONFIG_H @@ -601,6 +598,14 @@ static const video_db_t video_db[] = { }, { { + ME_FOURCC('V','P','6','F'), + 0 + }, + BUF_VIDEO_VP6F, + "On2 VP6" +}, +{ + { ME_FOURCC('8','B', 'P','S'), 0 }, diff --git a/src/xine-engine/configfile.c b/src/xine-engine/configfile.c index eb8e4972a..2f5e6214a 100644 --- a/src/xine-engine/configfile.c +++ b/src/xine-engine/configfile.c @@ -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: configfile.c,v 1.85 2007/02/22 15:49:16 dgp85 Exp $ - * * config object (was: file) management - implementation - * */ #ifdef HAVE_CONFIG_H diff --git a/src/xine-engine/configfile.h b/src/xine-engine/configfile.h index 4c9f315c3..22a544c00 100644 --- a/src/xine-engine/configfile.h +++ b/src/xine-engine/configfile.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: configfile.h,v 1.42 2007/02/22 15:49:16 dgp85 Exp $ - * * config file management - * */ #ifndef HAVE_CONFIGFILE_H diff --git a/src/xine-engine/demux.c b/src/xine-engine/demux.c index 9cdbea87a..f33397256 100644 --- a/src/xine-engine/demux.c +++ b/src/xine-engine/demux.c @@ -19,8 +19,6 @@ * * Demuxer helper functions * hide some xine engine details from demuxers and reduce code duplication - * - * $Id: demux.c,v 1.66 2007/01/18 23:28:46 dgp85 Exp $ */ diff --git a/src/xine-engine/events.c b/src/xine-engine/events.c index 642ca21b1..f79187682 100644 --- a/src/xine-engine/events.c +++ b/src/xine-engine/events.c @@ -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: events.c,v 1.32 2006/10/16 22:18:24 valtri Exp $ - * * Event handling functions - * */ #ifdef HAVE_CONFIG_H diff --git a/src/xine-engine/info_helper.c b/src/xine-engine/info_helper.c index a39fdc9a0..1ac4ed982 100644 --- a/src/xine-engine/info_helper.c +++ b/src/xine-engine/info_helper.c @@ -19,8 +19,6 @@ * * stream metainfo helper functions * hide some xine engine details from demuxers and reduce code duplication - * - * $Id: info_helper.c,v 1.19 2006/10/16 22:18:24 valtri Exp $ */ #ifdef HAVE_CONFIG_H diff --git a/src/xine-engine/input_cache.c b/src/xine-engine/input_cache.c index c54a57c08..83ec4ae33 100644 --- a/src/xine-engine/input_cache.c +++ b/src/xine-engine/input_cache.c @@ -21,8 +21,6 @@ * * The goal of this input plugin is to reduce * the number of calls to the real input plugin. - * - * $Id: input_cache.c,v 1.14 2007/02/20 00:34:57 dgp85 Exp $ */ #ifdef HAVE_CONFIG_H diff --git a/src/xine-engine/input_rip.c b/src/xine-engine/input_rip.c index 2c9d20c82..a8268552a 100644 --- a/src/xine-engine/input_rip.c +++ b/src/xine-engine/input_rip.c @@ -28,8 +28,6 @@ * * - it's possible speeder saving streams in the xine without playing: * xine stream_mrl#save:file.raw\;noaudio\;novideo - * - * $Id: input_rip.c,v 1.34 2007/02/20 00:34:57 dgp85 Exp $ */ /* TODO: diff --git a/src/xine-engine/load_plugins.c b/src/xine-engine/load_plugins.c index c34d58b09..19a8b4e05 100644 --- a/src/xine-engine/load_plugins.c +++ b/src/xine-engine/load_plugins.c @@ -17,11 +17,8 @@ * along with this program; if not, write to the Free Software * 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 $ - * * * Load input/demux/audio_out/video_out/codec plugins - * */ #ifdef HAVE_CONFIG_H @@ -156,7 +153,6 @@ static void dec_node_ref(plugin_node_t *node) { /* * plugin list/catalog management functions - * */ static int get_decoder_priority(xine_t *this, plugin_node_t *node) { diff --git a/src/xine-engine/lrb.c b/src/xine-engine/lrb.c index 83214a0ea..6da846a7c 100644 --- a/src/xine-engine/lrb.c +++ b/src/xine-engine/lrb.c @@ -16,9 +16,6 @@ * You 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 - * - * $Id: lrb.c,v 1.8 2003/12/09 00:02:36 f1rmb Exp $ - * */ #ifdef HAVE_CONFIG_H diff --git a/src/xine-engine/lrb.h b/src/xine-engine/lrb.h index cf24abb62..491ae8843 100644 --- a/src/xine-engine/lrb.h +++ b/src/xine-engine/lrb.h @@ -17,11 +17,8 @@ * along with this program; if not, write to the Free Software * 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 $ - * * lrb : limited ring buffer * used for temporal buffer, limited to n elements - * */ #ifndef HAVE_LRB_H diff --git a/src/xine-engine/metronom.c b/src/xine-engine/metronom.c index f83dd867e..328d2cb3c 100644 --- a/src/xine-engine/metronom.c +++ b/src/xine-engine/metronom.c @@ -16,8 +16,6 @@ * You 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 - * - * $Id: metronom.c,v 1.144 2007/02/20 00:34:57 dgp85 Exp $ */ #ifdef HAVE_CONFIG_H diff --git a/src/xine-engine/metronom.h b/src/xine-engine/metronom.h index dab25a450..77919f16e 100644 --- a/src/xine-engine/metronom.h +++ b/src/xine-engine/metronom.h @@ -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: metronom.h,v 1.64 2006/09/26 05:19:49 dgp85 Exp $ - * * metronom: general pts => virtual calculation/assoc * * virtual pts: unit 1/90000 sec, always increasing @@ -37,7 +35,6 @@ * video_pts and audio_vpts are not given for every frame. * - corrections to the frame rate may be needed to cope with bad * encoded streams. - * */ #ifndef HAVE_METRONOM_H diff --git a/src/xine-engine/osd.h b/src/xine-engine/osd.h index d84ce55bf..7b04c0a17 100644 --- a/src/xine-engine/osd.h +++ b/src/xine-engine/osd.h @@ -18,7 +18,6 @@ * 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 $ */ #ifndef HAVE_OSD_H diff --git a/src/xine-engine/plugin_catalog.h b/src/xine-engine/plugin_catalog.h index e5f01158a..fd9afb959 100644 --- a/src/xine-engine/plugin_catalog.h +++ b/src/xine-engine/plugin_catalog.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: plugin_catalog.h,v 1.21 2006/09/26 05:19:49 dgp85 Exp $ - * * xine-internal header: Definitions for plugin lists - * */ #ifndef _PLUGIN_CATALOG_H diff --git a/src/xine-engine/post.c b/src/xine-engine/post.c index 7c4becbee..e54d2234f 100644 --- a/src/xine-engine/post.c +++ b/src/xine-engine/post.c @@ -16,8 +16,6 @@ * You 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 - * - * $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 d02d68005..6186f31e0 100644 --- a/src/xine-engine/post.h +++ b/src/xine-engine/post.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: post.h,v 1.26 2007/02/20 01:13:08 dgp85 Exp $ - * * post plugin definitions - * */ #ifndef XINE_POST_H diff --git a/src/xine-engine/refcounter.c b/src/xine-engine/refcounter.c index f951f3261..539abf3ed 100644 --- a/src/xine-engine/refcounter.c +++ b/src/xine-engine/refcounter.c @@ -16,9 +16,6 @@ * You 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 - * - * $Id: refcounter.c,v 1.2 2006/09/26 05:19:49 dgp85 Exp $ - * */ #define LOG_MODULE "refcounter" #define LOG_VERBOSE diff --git a/src/xine-engine/refcounter.h b/src/xine-engine/refcounter.h index de378f7bc..a662a974e 100644 --- a/src/xine-engine/refcounter.h +++ b/src/xine-engine/refcounter.h @@ -16,9 +16,6 @@ * You 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 - * - * $Id: refcounter.h,v 1.2 2006/09/26 05:19:49 dgp85 Exp $ - * */ #ifndef HAVE_REFCOUNTER_H #define HAVE_REFCOUNTER_H diff --git a/src/xine-engine/resample.c b/src/xine-engine/resample.c index d73349039..43911c401 100644 --- a/src/xine-engine/resample.c +++ b/src/xine-engine/resample.c @@ -16,8 +16,6 @@ * You 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 - * - * $Id: resample.c,v 1.10 2006/09/26 05:19:49 dgp85 Exp $ */ #ifdef HAVE_CONFIG_H diff --git a/src/xine-engine/resample.h b/src/xine-engine/resample.h index c291917b6..40b4de486 100644 --- a/src/xine-engine/resample.h +++ b/src/xine-engine/resample.h @@ -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: resample.h,v 1.6 2006/09/26 05:19:49 dgp85 Exp $ - * * utilitiy functions for audio drivers * * FIXME: not all of them are implemented yet diff --git a/src/xine-engine/scratch.c b/src/xine-engine/scratch.c index dfeaa4907..98fed2cdd 100644 --- a/src/xine-engine/scratch.c +++ b/src/xine-engine/scratch.c @@ -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: scratch.c,v 1.24 2007/01/19 00:12:22 dgp85 Exp $ - * * top-level xine functions - * */ #ifdef HAVE_CONFIG_H diff --git a/src/xine-engine/scratch.h b/src/xine-engine/scratch.h index 124afd2be..c0e591d31 100644 --- a/src/xine-engine/scratch.h +++ b/src/xine-engine/scratch.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: scratch.h,v 1.13 2007/01/19 00:12:22 dgp85 Exp $ - * * scratch buffer for log output - * */ #ifndef HAVE_SCRATCH_H diff --git a/src/xine-engine/tvmode.c b/src/xine-engine/tvmode.c index 0b28ab629..099bdb808 100644 --- a/src/xine-engine/tvmode.c +++ b/src/xine-engine/tvmode.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: tvmode.c,v 1.17 2003/12/09 00:02:37 f1rmb Exp $ - * * tvmode - TV output selection * * Currently uses nvtvd (Dirk Thierbach <dthierbach@gmx.de>) diff --git a/src/xine-engine/video_decoder.c b/src/xine-engine/video_decoder.c index 585e83c14..c88e01714 100644 --- a/src/xine-engine/video_decoder.c +++ b/src/xine-engine/video_decoder.c @@ -16,9 +16,6 @@ * You 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 - * - * $Id: video_decoder.c,v 1.163 2007/02/20 00:34:58 dgp85 Exp $ - * */ #ifdef HAVE_CONFIG_H diff --git a/src/xine-engine/video_decoder.h b/src/xine-engine/video_decoder.h index e721f9e8d..7b13159a3 100644 --- a/src/xine-engine/video_decoder.h +++ b/src/xine-engine/video_decoder.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: video_decoder.h,v 1.14 2004/09/26 22:54:52 valtri Exp $ - * * xine video decoder plugin interface - * */ #ifndef HAVE_VIDEO_DECODER_H diff --git a/src/xine-engine/video_out.c b/src/xine-engine/video_out.c index f07244428..575017301 100644 --- a/src/xine-engine/video_out.c +++ b/src/xine-engine/video_out.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: video_out.c,v 1.228 2007/04/01 01:03:06 dgp85 Exp $ - * * frame allocation / queuing / scheduling / output functions */ diff --git a/src/xine-engine/video_out.h b/src/xine-engine/video_out.h index aceb1b6e5..db99334eb 100644 --- a/src/xine-engine/video_out.h +++ b/src/xine-engine/video_out.h @@ -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: video_out.h,v 1.114 2006/09/26 05:19:49 dgp85 Exp $ - * * * xine version of video_out.h * @@ -29,7 +27,6 @@ * * vo_port : generic frame_handling code, uses * a vo_driver for output - * */ #ifndef HAVE_VIDEO_OUT_H diff --git a/src/xine-engine/video_overlay.c b/src/xine-engine/video_overlay.c index 9d4961501..c189fa56b 100644 --- a/src/xine-engine/video_overlay.c +++ b/src/xine-engine/video_overlay.c @@ -16,9 +16,6 @@ * You 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 - * - * $Id: video_overlay.c,v 1.41 2006/09/26 00:28:14 dgp85 Exp $ - * */ #include <stdlib.h> diff --git a/src/xine-engine/video_overlay.h b/src/xine-engine/video_overlay.h index a6ff1d7c4..6bb529204 100644 --- a/src/xine-engine/video_overlay.h +++ b/src/xine-engine/video_overlay.h @@ -16,9 +16,6 @@ * You 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 - * - * $Id: video_overlay.h,v 1.21 2006/09/26 05:19:49 dgp85 Exp $ - * */ #ifndef HAVE_VIDEO_OVERLAY_H diff --git a/src/xine-engine/vo_scale.c b/src/xine-engine/vo_scale.c index c2098b9cd..ff30c47a6 100644 --- a/src/xine-engine/vo_scale.c +++ b/src/xine-engine/vo_scale.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: vo_scale.c,v 1.39 2006/09/26 08:00:02 dgp85 Exp $ - * * Contains common code to calculate video scaling parameters. * In short, it will map frame dimensions to screen/window size. * Takes into account aspect ratio correction and zooming. diff --git a/src/xine-engine/vo_scale.h b/src/xine-engine/vo_scale.h index fe89f49f4..e502b2f62 100644 --- a/src/xine-engine/vo_scale.h +++ b/src/xine-engine/vo_scale.h @@ -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: vo_scale.h,v 1.14 2006/09/26 05:19:49 dgp85 Exp $ - * * vo_scale.h * * keeps video scaling information diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c index cddca009a..83137fb82 100644 --- a/src/xine-engine/xine.c +++ b/src/xine-engine/xine.c @@ -16,8 +16,6 @@ * You 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 - * - * $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 fbb1b6758..48f3a6df0 100644 --- a/src/xine-engine/xine_interface.c +++ b/src/xine-engine/xine_interface.c @@ -17,11 +17,8 @@ * along with this program; if not, write to the Free Software * 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 $ - * * convenience/abstraction layer, functions to implement * libxine's public interface - * */ #ifdef HAVE_CONFIG_H diff --git a/src/xine-engine/xine_internal.h b/src/xine-engine/xine_internal.h index cc4ca1921..48aafa3f3 100644 --- a/src/xine-engine/xine_internal.h +++ b/src/xine-engine/xine_internal.h @@ -16,9 +16,6 @@ * You 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 - * - * $Id: xine_internal.h,v 1.181 2007/01/18 23:28:46 dgp85 Exp $ - * */ #ifndef HAVE_XINE_INTERNAL_H diff --git a/src/xine-engine/xine_plugin.h b/src/xine-engine/xine_plugin.h index 44b269d4c..74e7523e9 100644 --- a/src/xine-engine/xine_plugin.h +++ b/src/xine-engine/xine_plugin.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: xine_plugin.h,v 1.23 2007/01/19 02:49:31 dgp85 Exp $ - * * generic plugin definitions - * */ #ifndef XINE_PLUGIN_H diff --git a/src/xine-engine/xineintl.h b/src/xine-engine/xineintl.h index 2af09d752..113a033fa 100644 --- a/src/xine-engine/xineintl.h +++ b/src/xine-engine/xineintl.h @@ -16,9 +16,6 @@ * You 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 - * - * $Id: xineintl.h,v 1.9 2005/02/19 13:11:53 valtri Exp $ - * */ #ifndef HAVE_XINEINTL_H diff --git a/src/xine-utils/Makefile.am b/src/xine-utils/Makefile.am index 10f1714f9..bacb2720f 100644 --- a/src/xine-utils/Makefile.am +++ b/src/xine-utils/Makefile.am @@ -32,6 +32,7 @@ libxineutils_la_SOURCES = $(pppc_files) \ cpu_accel.c \ color.c \ copy.c \ + crc.c \ list.c \ memcpy.c \ monitor.c \ diff --git a/src/xine-utils/array.c b/src/xine-utils/array.c index 9b514b59c..6c226c7ef 100644 --- a/src/xine-utils/array.c +++ b/src/xine-utils/array.c @@ -16,9 +16,6 @@ * You 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 - * - * $Id: array.c,v 1.4 2007/02/03 16:31:55 dsalt Exp $ - * */ #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/src/xine-utils/array.h b/src/xine-utils/array.h index d23a77a52..ae2093823 100644 --- a/src/xine-utils/array.h +++ b/src/xine-utils/array.h @@ -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: array.h,v 1.3 2007/02/03 16:31:55 dsalt Exp $ - * * Array that can grow automatically when you add elements. * Inserting an element in the middle of the array implies memory moves. */ diff --git a/src/xine-utils/color.c b/src/xine-utils/color.c index 261dbe204..0b9cf0188 100644 --- a/src/xine-utils/color.c +++ b/src/xine-utils/color.c @@ -60,8 +60,6 @@ * to facilitate these operations (such as the PPC AltiVec pixel-unpacking * instructions), these macros will automatically map to those special * instructions. - * - * $Id: color.c,v 1.30 2006/07/17 18:31:24 hadess Exp $ */ #include "xine_internal.h" diff --git a/src/xine-utils/compat.h b/src/xine-utils/compat.h index 045fa8368..d4b95aeb3 100644 --- a/src/xine-utils/compat.h +++ b/src/xine-utils/compat.h @@ -16,9 +16,6 @@ * You 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 - * - * $Id: compat.h,v 1.3 2003/04/20 21:13:26 guenter Exp $ - * */ #ifndef XINE_COMPAT_H diff --git a/src/xine-utils/crc.c b/src/xine-utils/crc.c new file mode 100644 index 000000000..ba0e3010b --- /dev/null +++ b/src/xine-utils/crc.c @@ -0,0 +1,127 @@ +/* + * Copyright (C) 2000-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 + * + * Common CRC calculation code. + */ + +#include "xineutils.h" + +static const uint32_t crc32_table[256] = { + 0x00000000, 0x04c11db7, 0x09823b6e, 0x0d4326d9, + 0x130476dc, 0x17c56b6b, 0x1a864db2, 0x1e475005, + 0x2608edb8, 0x22c9f00f, 0x2f8ad6d6, 0x2b4bcb61, + 0x350c9b64, 0x31cd86d3, 0x3c8ea00a, 0x384fbdbd, + 0x4c11db70, 0x48d0c6c7, 0x4593e01e, 0x4152fda9, + 0x5f15adac, 0x5bd4b01b, 0x569796c2, 0x52568b75, + 0x6a1936c8, 0x6ed82b7f, 0x639b0da6, 0x675a1011, + 0x791d4014, 0x7ddc5da3, 0x709f7b7a, 0x745e66cd, + 0x9823b6e0, 0x9ce2ab57, 0x91a18d8e, 0x95609039, + 0x8b27c03c, 0x8fe6dd8b, 0x82a5fb52, 0x8664e6e5, + 0xbe2b5b58, 0xbaea46ef, 0xb7a96036, 0xb3687d81, + 0xad2f2d84, 0xa9ee3033, 0xa4ad16ea, 0xa06c0b5d, + 0xd4326d90, 0xd0f37027, 0xddb056fe, 0xd9714b49, + 0xc7361b4c, 0xc3f706fb, 0xceb42022, 0xca753d95, + 0xf23a8028, 0xf6fb9d9f, 0xfbb8bb46, 0xff79a6f1, + 0xe13ef6f4, 0xe5ffeb43, 0xe8bccd9a, 0xec7dd02d, + 0x34867077, 0x30476dc0, 0x3d044b19, 0x39c556ae, + 0x278206ab, 0x23431b1c, 0x2e003dc5, 0x2ac12072, + 0x128e9dcf, 0x164f8078, 0x1b0ca6a1, 0x1fcdbb16, + 0x018aeb13, 0x054bf6a4, 0x0808d07d, 0x0cc9cdca, + 0x7897ab07, 0x7c56b6b0, 0x71159069, 0x75d48dde, + 0x6b93dddb, 0x6f52c06c, 0x6211e6b5, 0x66d0fb02, + 0x5e9f46bf, 0x5a5e5b08, 0x571d7dd1, 0x53dc6066, + 0x4d9b3063, 0x495a2dd4, 0x44190b0d, 0x40d816ba, + 0xaca5c697, 0xa864db20, 0xa527fdf9, 0xa1e6e04e, + 0xbfa1b04b, 0xbb60adfc, 0xb6238b25, 0xb2e29692, + 0x8aad2b2f, 0x8e6c3698, 0x832f1041, 0x87ee0df6, + 0x99a95df3, 0x9d684044, 0x902b669d, 0x94ea7b2a, + 0xe0b41de7, 0xe4750050, 0xe9362689, 0xedf73b3e, + 0xf3b06b3b, 0xf771768c, 0xfa325055, 0xfef34de2, + 0xc6bcf05f, 0xc27dede8, 0xcf3ecb31, 0xcbffd686, + 0xd5b88683, 0xd1799b34, 0xdc3abded, 0xd8fba05a, + 0x690ce0ee, 0x6dcdfd59, 0x608edb80, 0x644fc637, + 0x7a089632, 0x7ec98b85, 0x738aad5c, 0x774bb0eb, + 0x4f040d56, 0x4bc510e1, 0x46863638, 0x42472b8f, + 0x5c007b8a, 0x58c1663d, 0x558240e4, 0x51435d53, + 0x251d3b9e, 0x21dc2629, 0x2c9f00f0, 0x285e1d47, + 0x36194d42, 0x32d850f5, 0x3f9b762c, 0x3b5a6b9b, + 0x0315d626, 0x07d4cb91, 0x0a97ed48, 0x0e56f0ff, + 0x1011a0fa, 0x14d0bd4d, 0x19939b94, 0x1d528623, + 0xf12f560e, 0xf5ee4bb9, 0xf8ad6d60, 0xfc6c70d7, + 0xe22b20d2, 0xe6ea3d65, 0xeba91bbc, 0xef68060b, + 0xd727bbb6, 0xd3e6a601, 0xdea580d8, 0xda649d6f, + 0xc423cd6a, 0xc0e2d0dd, 0xcda1f604, 0xc960ebb3, + 0xbd3e8d7e, 0xb9ff90c9, 0xb4bcb610, 0xb07daba7, + 0xae3afba2, 0xaafbe615, 0xa7b8c0cc, 0xa379dd7b, + 0x9b3660c6, 0x9ff77d71, 0x92b45ba8, 0x9675461f, + 0x8832161a, 0x8cf30bad, 0x81b02d74, 0x857130c3, + 0x5d8a9099, 0x594b8d2e, 0x5408abf7, 0x50c9b640, + 0x4e8ee645, 0x4a4ffbf2, 0x470cdd2b, 0x43cdc09c, + 0x7b827d21, 0x7f436096, 0x7200464f, 0x76c15bf8, + 0x68860bfd, 0x6c47164a, 0x61043093, 0x65c52d24, + 0x119b4be9, 0x155a565e, 0x18197087, 0x1cd86d30, + 0x029f3d35, 0x065e2082, 0x0b1d065b, 0x0fdc1bec, + 0x3793a651, 0x3352bbe6, 0x3e119d3f, 0x3ad08088, + 0x2497d08d, 0x2056cd3a, 0x2d15ebe3, 0x29d4f654, + 0xc5a92679, 0xc1683bce, 0xcc2b1d17, 0xc8ea00a0, + 0xd6ad50a5, 0xd26c4d12, 0xdf2f6bcb, 0xdbee767c, + 0xe3a1cbc1, 0xe760d676, 0xea23f0af, 0xeee2ed18, + 0xf0a5bd1d, 0xf464a0aa, 0xf9278673, 0xfde69bc4, + 0x89b8fd09, 0x8d79e0be, 0x803ac667, 0x84fbdbd0, + 0x9abc8bd5, 0x9e7d9662, 0x933eb0bb, 0x97ffad0c, + 0xafb010b1, 0xab710d06, 0xa6322bdf, 0xa2f33668, + 0xbcb4666d, 0xb8757bda, 0xb5365d03, 0xb1f740b4 +}; + +uint32_t _x_compute_crc32 (const uint8_t *data, int32_t length, uint32_t crc32) +{ + int32_t i; + for (i = 0; i < length; ++i) + crc32 = (crc32 << 8) ^ crc32_table[(crc32 >> 24) ^ data[i]]; + return crc32; +} + +#if 0 +/* generate the CRC data */ + +#include <stdio.h> + +static void build_crc32_table (void) +{ + uint32_t i; + + for (i = 0; i < 256; ++i) + { + uint32_t j, k = 0; + for (j = (i << 24) | 0x800000; j != 0x80000000; j <<= 1) + k = (k << 1) ^ (((k ^ j) & 0x80000000) ? 0x04c11db7 : 0); + crc32_table[i] = k; + } +} + +int main (void) +{ + build_crc32_table (); + int i; + for (i = 0; i < 256; ++i) + printf ("0x%08x,%c", crc32_table[i], (3 & ~i) ? ' ' : '\n'); + return 0; +} + +#endif diff --git a/src/xine-utils/list.c b/src/xine-utils/list.c index a440ade9c..65bdaec26 100644 --- a/src/xine-utils/list.c +++ b/src/xine-utils/list.c @@ -16,9 +16,6 @@ * You 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 - * - * $Id: list.c,v 1.12 2006/09/26 05:19:49 dgp85 Exp $ - * */ #ifdef HAVE_CONFIG_H diff --git a/src/xine-utils/list.h b/src/xine-utils/list.h index ac1c91b5a..e00e30d6c 100644 --- a/src/xine-utils/list.h +++ b/src/xine-utils/list.h @@ -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: list.h,v 1.5 2007/02/19 23:34:32 dgp85 Exp $ - * * Doubly-linked linked list. * * Exemples: diff --git a/src/xine-utils/monitor.c b/src/xine-utils/monitor.c index ad1bfc5e7..3c7c3e10a 100644 --- a/src/xine-utils/monitor.c +++ b/src/xine-utils/monitor.c @@ -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: monitor.c,v 1.8 2006/06/23 18:24:22 dsalt Exp $ - * * debug print and profiling functions - implementation - * */ #ifdef HAVE_CONFIG_H diff --git a/src/xine-utils/pool.c b/src/xine-utils/pool.c index cd0e40b0d..a1fddadd9 100644 --- a/src/xine-utils/pool.c +++ b/src/xine-utils/pool.c @@ -16,9 +16,6 @@ * You 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 - * - * $Id: pool.c,v 1.2 2006/09/26 05:19:49 dgp85 Exp $ - * */ #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/src/xine-utils/pool.h b/src/xine-utils/pool.h index 01ef69556..918da82a2 100644 --- a/src/xine-utils/pool.h +++ b/src/xine-utils/pool.h @@ -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: pool.h,v 1.2 2006/09/26 05:19:49 dgp85 Exp $ - * * Object Pool */ diff --git a/src/xine-utils/ring_buffer.c b/src/xine-utils/ring_buffer.c index ed3b3aee9..031fda4fc 100644 --- a/src/xine-utils/ring_buffer.c +++ b/src/xine-utils/ring_buffer.c @@ -16,9 +16,6 @@ * You 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 - * - * $Id: ring_buffer.c,v 1.5 2006/09/26 05:19:49 dgp85 Exp $ - * */ #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/src/xine-utils/ring_buffer.h b/src/xine-utils/ring_buffer.h index 1c5bbcf51..efcffd3b7 100644 --- a/src/xine-utils/ring_buffer.h +++ b/src/xine-utils/ring_buffer.h @@ -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: ring_buffer.h,v 1.3 2006/09/26 05:19:49 dgp85 Exp $ - * * Fifo + Ring Buffer */ typedef struct xine_ring_buffer_s xine_ring_buffer_t; diff --git a/src/xine-utils/sorted_array.c b/src/xine-utils/sorted_array.c index c3dad54c9..363325f0b 100644 --- a/src/xine-utils/sorted_array.c +++ b/src/xine-utils/sorted_array.c @@ -16,9 +16,6 @@ * You 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 - * - * $Id: sorted_array.c,v 1.3 2006/09/26 05:19:49 dgp85 Exp $ - * */ #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/src/xine-utils/sorted_array.h b/src/xine-utils/sorted_array.h index 9a4d61bd8..a1894eca3 100644 --- a/src/xine-utils/sorted_array.h +++ b/src/xine-utils/sorted_array.h @@ -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: sorted_array.h,v 1.3 2006/09/26 05:19:49 dgp85 Exp $ - * * Sorted array which grows automatically when you add elements. * A binary search is used to find the position of a new element. * @@ -52,7 +50,6 @@ * * Delete the array: * xine_sarray_delete(sarray); - * */ #ifndef XINE_SORTED_ARRAY_H #define XINE_SORTED_ARRAY_H diff --git a/src/xine-utils/utils.c b/src/xine-utils/utils.c index 20286e7f6..980a2a520 100644 --- a/src/xine-utils/utils.c +++ b/src/xine-utils/utils.c @@ -16,9 +16,6 @@ * You 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 - * - * $Id: utils.c,v 1.46 2006/07/21 04:47:17 dgp85 Exp $ - * */ #define _POSIX_PTHREAD_SEMANTICS 1 /* for 5-arg getpwuid_r on solaris */ diff --git a/src/xine-utils/xine_buffer.c b/src/xine-utils/xine_buffer.c index 842253ecb..190ab5197 100644 --- a/src/xine-utils/xine_buffer.c +++ b/src/xine-utils/xine_buffer.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: xine_buffer.c,v 1.11 2006/06/23 18:24:22 dsalt Exp $ - * * * generic dynamic buffer functions. The goals * of these functions are (in fact many of these points diff --git a/src/xine-utils/xine_buffer.h b/src/xine-utils/xine_buffer.h index b1c99ee34..84511bd1b 100644 --- a/src/xine-utils/xine_buffer.h +++ b/src/xine-utils/xine_buffer.h @@ -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: xine_buffer.h,v 1.7 2006/09/26 05:19:49 dgp85 Exp $ - * * * generic dynamic buffer functions. The goals * of these functions are (in fact many of these points diff --git a/src/xine-utils/xine_mutex.c b/src/xine-utils/xine_mutex.c index 9c2943ea0..c94f32be0 100644 --- a/src/xine-utils/xine_mutex.c +++ b/src/xine-utils/xine_mutex.c @@ -16,9 +16,6 @@ * You 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 - * - * $Id: xine_mutex.c,v 1.5 2006/07/16 14:45:24 dsalt Exp $ - * */ #ifdef HAVE_CONFIG_H diff --git a/src/xine-utils/xineutils.h b/src/xine-utils/xineutils.h index 9750eefad..3296b2ba9 100644 --- a/src/xine-utils/xineutils.h +++ b/src/xine-utils/xineutils.h @@ -16,9 +16,6 @@ * You 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 - * - * $Id: xineutils.h,v 1.107 2006/12/25 15:16:33 dgp85 Exp $ - * */ #ifndef XINEUTILS_H #define XINEUTILS_H @@ -973,6 +970,11 @@ const char *xine_guess_spu_encoding(void) XINE_PROTECTED; */ int xine_monotonic_clock(struct timeval *tv, struct timezone *tz) XINE_PROTECTED; +/** + * CRC functions + */ +uint32_t _x_compute_crc32 (const uint8_t * data, int32_t length, uint32_t crc32) XINE_PROTECTED; + /* don't harm following code */ #ifdef extern # undef extern diff --git a/src/xine-utils/xmllexer.c b/src/xine-utils/xmllexer.c index a9fcd9e31..39632938f 100644 --- a/src/xine-utils/xmllexer.c +++ b/src/xine-utils/xmllexer.c @@ -17,9 +17,6 @@ * License along with the Gnome Library; see the file COPYING.LIB. If not, * 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 $ - * */ #define LOG_MODULE "xmllexer" diff --git a/src/xine-utils/xmllexer.h b/src/xine-utils/xmllexer.h index 5b6ce8311..10bcc8676 100644 --- a/src/xine-utils/xmllexer.h +++ b/src/xine-utils/xmllexer.h @@ -17,9 +17,6 @@ * License along with the Gnome Library; see the file COPYING.LIB. If not, * 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 $ - * */ /* xml lexer */ diff --git a/src/xine-utils/xmlparser.c b/src/xine-utils/xmlparser.c index 21d5a6de9..a7bc146a9 100644 --- a/src/xine-utils/xmlparser.c +++ b/src/xine-utils/xmlparser.c @@ -17,9 +17,6 @@ * License along with the Gnome Library; see the file COPYING.LIB. If not, * 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 $ - * */ #ifdef XINE_COMPILE diff --git a/src/xine-utils/xmlparser.h b/src/xine-utils/xmlparser.h index 2536e079f..c89cb6dd3 100644 --- a/src/xine-utils/xmlparser.h +++ b/src/xine-utils/xmlparser.h @@ -17,9 +17,6 @@ * License along with the Gnome Library; see the file COPYING.LIB. If not, * 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 $ - * */ #ifndef XML_PARSER_H |