diff options
393 files changed, 1922 insertions, 1696 deletions
@@ -1,8 +1,8 @@ GNU GENERAL PUBLIC LICENSE Version 2, June 1991 - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -15,7 +15,7 @@ software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to +the GNU Lesser General Public License instead.) You can apply it to your programs, too. When we speak of free software, we are referring to freedom, not @@ -55,7 +55,7 @@ patent must be licensed for everyone's free use or not licensed at all. The precise terms and conditions for copying, distribution and modification follow. - + GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION @@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions: License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) - + These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in @@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. - + 4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is @@ -225,7 +225,7 @@ impose that choice. This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. - + 8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License @@ -278,7 +278,7 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. END OF TERMS AND CONDITIONS - + How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest @@ -303,17 +303,16 @@ the "copyright" line and a pointer to where the full notice is found. 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 - + You 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-1301 USA. Also add information on how to contact you by electronic and paper mail. If the program is interactive, make it output a short notice like this when it starts in an interactive mode: - Gnomovision version 69, Copyright (C) year name of author + Gnomovision version 69, Copyright (C) year name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. @@ -336,5 +335,5 @@ necessary. Here is a sample; alter the names: This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General +library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. diff --git a/COPYING.LIB b/COPYING.LIB index eb685a5ec..b6bd51763 100644 --- a/COPYING.LIB +++ b/COPYING.LIB @@ -2,7 +2,7 @@ Version 2, June 1991 Copyright (C) 1991 Free Software Foundation, Inc. - 675 Mass Ave, Cambridge, MA 02139, USA + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -436,7 +436,7 @@ DAMAGES. END OF TERMS AND CONDITIONS - Appendix: How to Apply These Terms to Your New Libraries + How to Apply These Terms to Your New Libraries If you develop a new library, and you want it to be of the greatest possible use to the public, we recommend making it free software that @@ -464,7 +464,7 @@ convey the exclusion of warranty; and each file should have at least the You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Also add information on how to contact you by electronic and paper mail. @@ -10,6 +10,8 @@ xine-lib (1.1.9) (unreleased) * Fixed handling of streamed Flash videos (broken in 1.1.5). * Fixed division by zero in sputext decoder * Build fix for when using Linux 2.6.23 headers. [Bug 1820958] + * Implemented decoding of XML character entities with codes >= 256. + This requires conversion to UTF-8 of entities with codes >= 128. xine-lib (1.1.8) * Send a channel-changed event to the frontend when receiving the SYNC diff --git a/autogen.sh b/autogen.sh index e228f051b..cb8c637d2 100755 --- a/autogen.sh +++ b/autogen.sh @@ -16,9 +16,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA -# -# $Id: autogen.sh,v 1.20 2007/03/26 12:52:05 dgp85 Exp $ +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA # # Maintained by Stephen Torri <storri@users.sourceforge.net> # diff --git a/doc/README.dxr3 b/doc/README.dxr3 index db1e97585..41fe9ad74 100644 --- a/doc/README.dxr3 +++ b/doc/README.dxr3 @@ -183,8 +183,3 @@ prefer, of course). Have a look at the previous explained configuration options dxr3.output.keycolor and dxr3.output.keycolor_interval too. - - ---- -version of this file: - $Id: README.dxr3,v 1.11 2004/12/12 22:00:47 mroi Exp $ diff --git a/doc/README.freebsd b/doc/README.freebsd index 7ef1918b4..900f60aa1 100644 --- a/doc/README.freebsd +++ b/doc/README.freebsd @@ -108,9 +108,3 @@ v4l on freebsd For building v4l plugins you will need install v4l_compat package. ------------------------------------------------------------------------ - - - ---- -version of this file: - $Id: README.freebsd,v 1.7 2006/10/16 22:09:32 valtri Exp $ diff --git a/doc/README.network_dvd b/doc/README.network_dvd index b64916190..4798b79f8 100644 --- a/doc/README.network_dvd +++ b/doc/README.network_dvd @@ -135,7 +135,3 @@ dvd commands: dvd_title <block> <error code> 0 - ---- -version of this file: - $Id: README.network_dvd,v 1.3 2004/12/12 22:00:48 mroi Exp $ diff --git a/doc/README.solaris b/doc/README.solaris index dbc9d8743..9e78287a9 100644 --- a/doc/README.solaris +++ b/doc/README.solaris @@ -129,8 +129,3 @@ Known Problems See the following message for more details about this bug: http://groups.yahoo.com/group/solarisonintel/message/22516 - - ---- -version of this file: - $Id: README.solaris,v 1.14 2004/06/19 14:51:31 komadori Exp $ diff --git a/doc/README.syncfb b/doc/README.syncfb index 1adfb8bfd..fc90ff586 100644 --- a/doc/README.syncfb +++ b/doc/README.syncfb @@ -4,10 +4,6 @@ ===== ===== - VERSION - => $Id: README.syncfb,v 1.4 2006/11/30 08:45:51 matt2000 Exp $ - - * WHAT IS THIS PLUGIN ABOUT and WHY SHOULD I EVEN CONSIDER TO USE IT? :) This xine video output plugin uses the so called SyncFB driver (from diff --git a/doc/hackersguide/README b/doc/hackersguide/README index f8c17e89c..c0c0d944a 100644 --- a/doc/hackersguide/README +++ b/doc/hackersguide/README @@ -39,7 +39,3 @@ building the hackersguide.html ------------------------------ The easy way to build everything is to issue a "make docs" here. - ---- -version of this file: - $Id: README,v 1.3 2003/10/12 19:06:43 mroi Exp $ diff --git a/include/xine.h.in b/include/xine.h.in index c25aef4b1..ad70e0953 100644 --- a/include/xine.h.in +++ b/include/xine.h.in @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: xine.h.in,v 1.168 2007/03/26 11:48:01 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * public xine-lib (libxine) interface and documentation * diff --git a/lib/asprintf.c b/lib/asprintf.c index 6c9d90664..1027e82dd 100644 --- a/lib/asprintf.c +++ b/lib/asprintf.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * */ diff --git a/lib/os_types.h b/lib/os_types.h index 0cee183cc..75ce9b8a5 100644 --- a/lib/os_types.h +++ b/lib/os_types.h @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: os_types.h,v 1.5 2006/04/08 16:42:23 valtri Exp $ Ext + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * Platform dependent types needed by public xine.h. * Types not needed by xine.h are specified in os_internal.h. diff --git a/misc/cdda_server.c b/misc/cdda_server.c index c4b3f44cb..553ec0a8a 100644 --- a/misc/cdda_server.c +++ b/misc/cdda_server.c @@ -1,4 +1,24 @@ -/* CDDA / DVD server +/* + * CDDA / DVD server + * + * Copyright (C) 2003-2007 the xine project + * + * This file is part of xine, a free video player. + * + * xine is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * xine is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA + * * * This is a TCP server that can be used with xine's cdda input plugin to * play audio CDs over the network. It also supports playing DVDs with a diff --git a/misc/xine-fontconv.c b/misc/xine-fontconv.c index 67717c883..e8edaae5b 100644 --- a/misc/xine-fontconv.c +++ b/misc/xine-fontconv.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * OSD stuff (text and graphic primitives) * @@ -4,13 +4,14 @@ # # Juan Manuel GarcÃa Molina <juanma_gm@wanadoo.es>, 2002. # Carlos E. Robinson M. <carloser@users.sourceforge.net>, 2006, 2007. +# Cer: <<== marcas de revision. msgid "" msgstr "" "Project-Id-Version: xine-lib-1.1.4\n" "Report-Msgid-Bugs-To: xine-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2007-08-26 22:19+0100\n" -"PO-Revision-Date: 2007-02-28 14:07+0100\n" -"Last-Translator: Carlos E. Robinson M. <carloser@users.sourceforge.net>\n" +"PO-Revision-Date: 2007-10-28 00:11+0200\n" +"Last-Translator: Carlos E. Robinson <carloser@users.sourceforge.net>\n" "Language-Team: Spanish\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,35 +21,31 @@ msgstr "" "X-Poedit-Language: Spanish\n" "X-Poedit-Country: SPAIN\n" "X-Poedit-SourceCharset: utf-8\n" -"X-Poedit-Basepath: /home/cer/compilaciones/xine/xine-lib-1.1.4\n" +"X-Poedit-Basepath: /home/cer/Documents/babel/xine-lib/po/\n" #: lib/hstrerror.c:17 -#, fuzzy msgid "No error" -msgstr "error desconocido" +msgstr "Sin error" #: lib/hstrerror.c:18 -#, fuzzy msgid "Unknown host" -msgstr "error desconocido" +msgstr "Host desconocido" #: lib/hstrerror.c:19 msgid "No address associated with name" -msgstr "" +msgstr "No hay dirección asociada con el nombre" #: lib/hstrerror.c:20 -#, fuzzy msgid "Unknown server error" -msgstr "error desconocido" +msgstr "Error de servidor desconocido" #: lib/hstrerror.c:21 msgid "Host name lookup failure" -msgstr "" +msgstr "Fallo de búsqueda de nombre del host" #: lib/hstrerror.c:22 -#, fuzzy msgid "Unknown error" -msgstr "error desconocido" +msgstr "Error desconocido" #: src/audio_out/audio_alsa_out.c:353 #, c-format @@ -243,7 +240,7 @@ msgstr "" "un superbajos para las frecuencias bajas.\n" "Paso libre: Su sistema de sonido recibirá sonido digital sin decodificar de " "xine. Necesita conectar un decodificador digital envolvente capaz de " -"decodificar los formatos que quiera reproducir mediate la salida digital de " +"decodificar los formatos que quiera reproducir mediante la salida digital de " "su tarjeta de sonido." #: src/audio_out/audio_alsa_out.c:1499 @@ -568,8 +565,8 @@ msgid "" "The unit of the value is one PTS tick, which is the 90000th part of a second." msgstr "" "Si observa que el sonido no está sincronizado con la imagen, puede " -"introducir aquà un desfase fijo para compensar.\n" -"La unidad del valor es un tick PTS tick, que es 1/90000 de segundo." +"introducir aquà un desfase fijo para compensar.\n" +"La unidad del valor es una marca PTS, que es 1/90000 segundo." #: src/audio_out/audio_esd_out.c:574 msgid "xine audio output plugin using esound" @@ -592,16 +589,16 @@ msgid "" msgstr "" "Puede especificar la máxima distancia entre el audio y el video que xine " "tolerará antes de que trate de resincronizarlos.\n" -"La unidad del valor es un tick PTS tick, que es 1/90000 de segundo." +"La unidad del valor es una marca PTS, que es 1/90000 segundo." #: src/audio_out/audio_irixal_out.c:417 msgid "xine audio output plugin using IRIX libaudio" msgstr "complemento de xine de salida de audio usando libaudio IRIX" #: src/audio_out/audio_jack_out.c:406 -#, fuzzy msgid "xine output plugin for JACK Audio Connection Kit" -msgstr "complemento de xine de salida de audio para Coreaudio/Mac OS X" +msgstr "" +"complemento de xine de salida de audio para \"JACK Audio Connection Kit\"" #: src/audio_out/audio_none_out.c:225 msgid "xine dummy audio output plugin" @@ -813,22 +810,23 @@ msgstr "" "complemento de xine de salida de audio usando dispositivos/drivers " "compatibles OSS" +# Cer: ¿pulseaudio? #: src/audio_out/audio_pulse_out.c:608 -#, fuzzy msgid "device used for pulseaudio" -msgstr "dispositivo usado para polypaudio" +msgstr "dispositivo usado para audio a pulsos" +# Cer: ¿pulseaudio? Estaba como "polypaudio" pero fuzzy. #: src/audio_out/audio_pulse_out.c:609 -#, fuzzy msgid "use 'server[:sink]' for setting the pulseaudio sink device." msgstr "" -"use 'server[:sink]' para definir el sumidero del dispositivo polypaudio." +"use 'server[:sink]' para definir el sumidero del dispositivo audio a pulsos." +# Cer: ¿pulseaudio? #: src/audio_out/audio_pulse_out.c:646 -#, fuzzy msgid "xine audio output plugin using pulseaudio sound server" msgstr "" -"complemento de xine de salida de audio usando servidor de sonido polypaudio" +"complemento de xine de salida de audio usando servidor de sonido audio a " +"pulsos" #: src/audio_out/audio_sun_out.c:459 src/audio_out/audio_sun_out.c:952 #, c-format @@ -854,9 +852,10 @@ msgstr "" "realmente un dispositivo audio de Sun." #: src/audio_out/audio_sun_out.c:970 -#, fuzzy, c-format +#, c-format msgid "audio_sun_out: audio ioctl on device %s failed: %s\n" -msgstr "audio_sun_out: fallo al abrir el dispositivo audio %s: %s\n" +msgstr "" +"audio_sun_out: fallo al abrir el controlador del dispositivo audio %s: %s\n" #: src/audio_out/audio_sun_out.c:1024 msgid "xine audio output plugin using sun-compliant audio devices/drivers" @@ -911,11 +910,11 @@ msgstr "bloque FILM no reconocido\n" #: src/demuxers/demux_flv.c:172 #, c-format msgid "unsupported FLV version (%d).\n" -msgstr "" +msgstr "Versión FLV no soportada (%d).\n" #: src/demuxers/demux_flv.c:179 msgid "neither video nor audio stream in this file.\n" -msgstr "" +msgstr "no hay flujo de vÃdeo ni audio en este fichero.\n" #: src/demuxers/demux_iff.c:235 #, c-format @@ -1026,7 +1025,7 @@ msgstr "demux_snd: tipo de audio no soportado: %d\n" #: src/demuxers/demux_tta.c:88 msgid "demux_tta: total frames count too high\n" -msgstr "" +msgstr "demux_tta: la cuenta total de cuadros es demasiado alta\n" #: src/demuxers/demux_voc.c:105 #, c-format @@ -1646,14 +1645,15 @@ msgstr "" "Un valor de cero desactivará el enlentecimiento." #: src/input/input_dvb.c:895 -#, fuzzy, c-format +#, c-format msgid "input_dvb: failed to open dvb channel file '%s': %s\n" -msgstr "input_dvb: failló al abrir el fichero de canales DVB '%s'\n" +msgstr "input_dvb: falló al abrir el fichero de canales'%s': %s\n" #: src/input/input_dvb.c:901 -#, fuzzy, c-format +#, c-format msgid "input_dvb: dvb channel file '%s' is not a plain file\n" -msgstr "input_dvb: failló al abrir el fichero de canales DVB '%s'\n" +msgstr "" +"input_dvb: el fichero de canales dvb '%s' no es un fichero texto plano\n" #: src/input/input_dvb.c:2139 src/input/input_dvb.c:2971 msgid "input_dvb: tuner_set_channel failed\n" @@ -1687,7 +1687,7 @@ msgstr "input_dvb: encontrado el canal correspondiente %s\n" # Cer: (temporal) "valores por defecto" no es la traducción exacta #: src/input/input_dvb.c:2849 -#, fuzzy, c-format +#, c-format msgid "input_dvb: channel %s not found in channels.conf, defaulting.\n" msgstr "" "input_dvb: canal %s no encontrado en channels.conf, yendo a valores por " @@ -1710,7 +1710,7 @@ msgid "" "input_dvb: dvbs mrl specified but the tuner doesn't appear to be QPSK (DVB-" "S)\n" msgstr "" -"input_dvb: se especificó MRL DVBS pero el sintonizador no aparenta ser QPSK " +"input_dvb: se especificó mrl dvbs pero el sintonizador no aparenta ser QPSK " "(DVB-S)\n" #: src/input/input_dvb.c:2893 @@ -1718,7 +1718,7 @@ msgid "" "input_dvb: dvbt mrl specified but the tuner doesn't appear to be OFDM (DVB-" "T)\n" msgstr "" -"input_dvb: se especificó MRL DVBT pero el sintonizador no aparenta ser OFDM " +"input_dvb: se especificó mrl dvbt pero el sintonizador no aparenta ser OFDM " "(DVB-T)\n" #: src/input/input_dvb.c:2916 @@ -1726,17 +1726,16 @@ msgid "" "input_dvb: dvbc mrl specified but the tuner doesn't appear to be QAM (DVB-" "C)\n" msgstr "" -"input_dvb: se especificó MRL DVBC pero el sintonizador no aparenta ser QAM " +"input_dvb: se especificó mrl dvbc pero el sintonizador no aparenta ser QAM " "(DVB-C)\n" #: src/input/input_dvb.c:2942 -#, fuzzy msgid "" "input_dvb: dvba mrl specified but the tuner doesn't appear to be ATSC (DVB-" "A)\n" msgstr "" -"input_dvb: se especificó MRL DVBC pero el sintonizador no aparenta ser QAM " -"(DVB-C)\n" +"input_dvb: se especificó mrl dvba pero el sintonizador no aparenta ser ATSC " +"(DVB-A)\n" #: src/input/input_dvb.c:2977 #, c-format @@ -1785,13 +1784,15 @@ msgstr "Si se activa xine recordará y cambiará a este canal. " #: src/input/input_dvb.c:3283 msgid "Number of seconds until tuning times out." -msgstr "" +msgstr "Número de segundos hasta que la sintonización temporice." #: src/input/input_dvb.c:3284 msgid "" "Leave at 0 means try forever. Greater than 0 means wait that many seconds to " "get a lock. Minimum is 5 seconds." msgstr "" +"Dejar como 0 significa probar indefinidamente. Mayor que cero significa " +"esperar esos segundos hasta conseguir un ajuste. El mÃnimo son 5 segundos." #: src/input/input_dvb.c:3290 msgid "Number of dvb card to use." @@ -2107,9 +2108,9 @@ msgid "input_http: content length = %<PRIdMAX> bytes\n" msgstr "input_http: longitud del contenido = %<PRIdMAX> bytes\n" #: src/input/input_http.c:959 -#, fuzzy, c-format +#, c-format msgid "input_http: buffer exhausted after %d bytes." -msgstr "input_http: error de lectura %d\n" +msgstr "input_http: tampón agotado después de %d bytes." #: src/input/input_http.c:1057 msgid "http input plugin" @@ -2324,7 +2325,7 @@ msgstr "RTP: hilo de lectura terminado\n" # Cer: no esoy seguro del formato. #: src/input/input_rtp.c:648 -#, fuzzy, c-format +#, c-format msgid "Opening >filename:%s port:%d interface:%s<\n" msgstr "Abriendo >fichero:%s puerto:%d interfase:%s<\n" @@ -2507,9 +2508,10 @@ msgstr "URL inválida\n" msgid "unsupported protocol\n" msgstr "protocolo no soportado\n" +# msgstr "Tamponeando..." #: src/input/net_buf_ctrl.c:89 msgid "Buffering..." -msgstr "Tamponeando..." +msgstr "Llenando mem. tampón..." #: src/input/pnm.c:617 #, c-format @@ -2848,9 +2850,8 @@ msgstr "" "tampón 0x%X\n" #: src/libffmpeg/ff_audio_decoder.c:256 -#, fuzzy msgid "ffmpeg_audio_dec: trying to open null codec\n" -msgstr "ffmpeg_audio_dec: no pude abrir el decodificador\n" +msgstr "ffmpeg_audio_dec: intentando abrir códec nulo\n" #: src/libffmpeg/ff_audio_decoder.c:265 msgid "ffmpeg_audio_dec: couldn't open decoder\n" @@ -2984,7 +2985,6 @@ msgid "path to RealPlayer codecs" msgstr "camino a los codificadores RealPlayer" #: src/libreal/real_common.c:108 -#, fuzzy msgid "" "If you have RealPlayer installed, specify the path to its codec directory " "here. You can easily find the codec directory by looking for a file named " @@ -2993,9 +2993,9 @@ msgid "" "information on how to install the codecs." msgstr "" "Si tiene instalado RealPlayer, indique aquà el camino a su directorio de " -"codificadores (códecs). Puede encontrar facilmente el directorio de " -"cofidicadores buscando un fichero llamado \"drv3.so.6.0\". Si xine puede " -"encontrar los códecs de RealPlayer, los usará para decodificar contenido " +"codificadores (codecs). Puede encontrar fácilmente el directorio de " +"codificadores buscando un fichero llamado \"drvc.so\" en él. Si xine puede " +"encontrar los códecs de RealPlayer, los usará para decodificar el contenido " "RealPlayer para usted. Consulte el FAQ de xine FAQ para más información " "sobre cómo instalar los codificadores." @@ -3146,15 +3146,14 @@ msgstr "" "subtÃtulos." #: src/libsputext/xine_sputext_decoder.c:953 -#, fuzzy msgid "An outline font file (e.g. a .ttf) to be used for the subtitle text." msgstr "" -"TipografÃa del directorio de xine que será usada para el texto de los " -"subtÃtulos." +"Un fichero de tipografÃa tipo linea (pe: a.ttf) que será usada para el texto " +"de los subtÃtulos." #: src/libsputext/xine_sputext_decoder.c:959 msgid "whether to use a freetype font" -msgstr "" +msgstr "si debemos usar una tipografÃa freetype" #: src/libsputext/xine_sputext_decoder.c:966 msgid "encoding of the subtitles" @@ -3192,12 +3191,10 @@ msgstr "" "tarjetas." #: src/libw32dll/common.c:17 -#, fuzzy msgid "path to Win32 codecs" -msgstr "camino a los codificadores RealPlayer" +msgstr "camino a los codificadores Win32" #: src/libw32dll/common.c:18 -#, fuzzy msgid "" "If you have the Windows or Apple Quicktime codec packs installed, specify " "the path the codec directory here. If xine can find the Windows or Apple " @@ -3205,12 +3202,12 @@ msgid "" "Quicktime streams for you. Consult the xine FAQ for more information on how " "to install the codecs." msgstr "" -"Si tiene instalado RealPlayer, indique aquà el camino a su directorio de " -"codificadores (códecs). Puede encontrar facilmente el directorio de " -"cofidicadores buscando un fichero llamado \"drv3.so.6.0\". Si xine puede " -"encontrar los códecs de RealPlayer, los usará para decodificar contenido " -"RealPlayer para usted. Consulte el FAQ de xine FAQ para más información " -"sobre cómo instalar los codificadores." +"Si tiene instalado los paquetes de codificador (codec) Quicktime de Windows " +"o Apple , indique aquà el camino a su directorio de codificadores. Si xine " +"puede encontrar los codificadores Quicktime de Windows o Apple, los usará " +"para decodificar flujos diversos de Windows Media y Quicktime para usted. " +"Consulte el FAQ de xine FAQ para más información sobre cómo instalar los " +"codificadores." #: src/libw32dll/w32codec.c:588 #, c-format @@ -3343,14 +3340,15 @@ msgstr "" msgid ": upmixing Mono to Stereo.\n" msgstr ": mejorando Mono a Stereo.\n" +# Cer: ¿upmixing? #: src/post/audio/upmix_mono.c:152 -#, fuzzy, c-format +#, c-format msgid ": upmixing a single channel from original %d channel stream.\n" msgid_plural ": upmixing a single channel from original %d channels stream.\n" msgstr[0] "" -": mejorando un canal simple desde los %d canales del flujo original.\n" +": mejorando un canal simple desde el %d canal del flujo original.\n" msgstr[1] "" -": mejorando un canal simple desde los %d canales del flujo original.\n" +": mejorando un canal simple desde los %d canales del flujo original.\n" #: src/post/audio/upmix_mono.c:157 msgid ": audio device not capable of AO_CAP_MODE_STEREO.\n" @@ -3365,9 +3363,14 @@ msgid "" "weighted mean over past samples (default); 2: use several samples to smooth " "the variations via the standard weighted mean over past samples.\n" msgstr "" +"Normaliza el audio maximizando el volumen sin distorsionar el sonido.\n" +"\n" +"Parámetros: Método: 1: usa una muestra única para nivelar las variaciones " +"vÃa la media ponderada standard de las muestras pasadas (por defecto); 2 usa " +"varias muestras para nivelar las variaciones vÃa la media ponderada standard " +"de las muestras pasadas.\n" #: src/post/deinterlace/xine_plugin.c:204 -#, fuzzy msgid "" "Advanced tvtime/deinterlacer plugin with pulldown detection\n" "This plugin aims to provide deinterlacing mechanisms comparable to high " @@ -3422,9 +3425,9 @@ msgstr "" "Complemento avanzado tvtime/desentrelazador con detección de despliegue de " "menú {pulldown}\n" "Este complemento trata de suministrar mecanismos de desentrelazado " -"comparables a reproductores progresivos de DVD y los asà llamados dobladores " -"de linea, para usar con monitores de ordenador, proyectores y otros " -"dispositivos de visualización progresiva.\n" +"comparables a reproductores de alta calidad progresivos de DVD y los asà " +"llamados dobladores de linea, para usar con monitores de ordenador, " +"proyectores y otros dispositivos de visualización progresiva.\n" " \n" "Parámetros\n" "\n" @@ -3434,7 +3437,7 @@ msgstr "" " Enabled (activado): Activar/desactivar el complemento.\n" "\n" " Pulldown (despliegue): Escoger el algoritmo de detección de despliegue 2-3 " -"{de menú?}. Las pelÃculas de 24 CPS (cuadros por segundo) que han sido " +"{¿de menú?}. Las pelÃculas de 24 CPS (cuadros por segundo) que han sido " "convertidas a NTSC pueden ser detectadas e inteligentemente reconstruidas a " "sus cuadros originales (no entrelazados).\n" "\n" @@ -3452,7 +3455,7 @@ msgstr "" "uniformemente en el tiempo, coincidiendo con la velocidad con que fueron " "rodados y eliminando el efecto de vibración.\n" "\n" -" Use_progressive_frame_flag (bandera de usar cuadro progresivo): Flujos de " +" Use_progressive_frame_flag (use bandera de cuadro progresivo): Flujos de " "datos MPEG2 bien creados usan una bandera para indicar material progresivo. " "Este ajuste controla si nos fiamos de esta bandera o no (algunos flujos de " "datos mpeg2 raros y erróneos la ponen mal).\n" @@ -3493,8 +3496,8 @@ msgstr "" "Con más cuadros por segundo, la animación será más suave y rápida, pero " "también requiere más potencia de CPU." +# Cer: ¿goom? #: src/post/goom/xine_goom.c:214 -#, fuzzy msgid "goom image width" msgstr "anchura de imagen goom" @@ -3502,8 +3505,8 @@ msgstr "anchura de imagen goom" msgid "The width in pixels of the image to be generated." msgstr "La anchura en pÃxeles de la imagen a ser generada." +# Cer: ¿goom? #: src/post/goom/xine_goom.c:219 -#, fuzzy msgid "goom image height" msgstr "altura de imagen goom" @@ -3515,8 +3518,8 @@ msgstr "La altura en pÃxeles de la imagen a ser generada." msgid "colorspace conversion method" msgstr "método de conversión del espacio de color" +# Cer: ¿goom? #: src/post/goom/xine_goom.c:227 -#, fuzzy msgid "" "You can choose the colorspace conversion method used by goom.\n" "The available selections should be self-explaining." @@ -3577,7 +3580,6 @@ msgstr "" "* mplayer's boxblur (C) 2002 Michael Niedermayer\n" #: src/post/planar/denoise3d.c:136 -#, fuzzy msgid "" "This filter aims to reduce image noise producing smooth images and making " "still images really still (This should enhance compressibility.). It can be " @@ -3593,7 +3595,7 @@ msgid "" msgstr "" "Este filtro trata de reducir el ruido de imagen produciendo imágenes suaves " "y haciendo la foto fija realmente fija (esto deberÃa mejorar la " -"comprensibilidad). Puede dársele de 0 a 3 parámetros. Si omite un parámetro, " +"compresibilidad). Puede dársele de 0 a 3 parámetros. Si omite un parámetro, " "se inferirá un valor razonable\n" "\n" "Parámetros\n" @@ -3676,7 +3678,6 @@ msgstr "" "* mplayer's eq2 (C) Hampa Hug, Daniel Moreno, Richard Felker\n" #: src/post/planar/expand.c:251 -#, fuzzy msgid "" "The expand plugin is meant to take frames of arbitrary aspect ratio and " "converts them to a different aspect (4:3 by default) by adding black bars on " @@ -3692,7 +3693,7 @@ msgid "" msgstr "" "El complemento expand (expansor) está pensado para tomar cuadros de razón de " "aspecto arbitrario y convertirlos a una razón de aspecto diferente (4:3 por " -"defecto) añadiendo barras negras arriba y abajo del cuadro. Esto nos permite " +"omisión) añadiendo barras negras arriba y abajo del cuadro. Esto nos permite " "desplazar superposiciones abajo en la zona negra de modo que no cubran la " "imagen\n" "\n" @@ -3701,6 +3702,7 @@ msgstr "" "superposición\n" " Overlay_y_offset: Manualmente desplazar la superposición verticalmente\n" " aspect: La razón de aspecto resultante deseada (4:3 por defecto)\n" +" Centre_cut_out_mode: extrae la imagen 4:3 contenida en un cuadro 16:9\n" "\n" #: src/post/planar/noise.c:402 @@ -3720,6 +3722,21 @@ msgid "" "\n" "* mplayer's noise (C) Michael Niedermayer\n" msgstr "" +"Añade ruido aleatorio al vÃdeo.\n" +"\n" +"Parámetros:\n" +" luma_strength: fuerza del ruido añadido al canal luma (0-100, omisión: 8)\n" +" chroma_strength: fuerza del ruido añadido al canal chroma (0-100, omisión: " +"5)\n" +" quality: nivel de calidad del ruido. fixed: patrón de ruido constante; " +"temporal: el patrón de ruido cambia entre cuadros; averaged temporal: " +"smoother patrón de ruido más suave que cambia entre cuadros. (omisión: " +"averaged temporal)\n" +" type: Tipo de ruido: uniforme or gaussiano. (omisión: gaussiano)\n" +" pattern: Mezcla ruido aleatorio con un patrón (semi)regular. (omisión: " +"False)\n" +"\n" +"* mplayer's noise (C) Michael Niedermayer\n" #: src/post/planar/pp.c:108 msgid "" @@ -3878,39 +3895,37 @@ msgstr "" "\"=desactivado)." #: src/video_out/video_out_directfb.c:1516 -#, fuzzy msgid "video_out_directfb: using hardware subpicture acceleration.\n" -msgstr "video_out_directfb: usando escalado de imagen en hardware acelerado.\n" +msgstr "video_out_directfb: usando aceleración hardware de subimagen\n" #: src/video_out/video_out_directfb.c:1530 -#, fuzzy msgid "video_out_directfb: layer supports video output.\n" -msgstr "video_out_directfb: ¡no se encontró una capa de salida usable!\n" +msgstr "video_out_directfb: la capa soporta salida de vÃdeo\n" #: src/video_out/video_out_directfb.c:1539 -#, fuzzy msgid "video_out_directfb: layer doesn't support YV12!\n" -msgstr "video_out_directfb: ¡no se encontró una capa de salida usable!\n" +msgstr "video_out_directfb: ¡la capa no soporta YV12!\n" #: src/video_out/video_out_directfb.c:1546 -#, fuzzy msgid "video_out_directfb: layer doesn't support YUY2!\n" -msgstr "video_out_directfb: ¡no se encontró una capa de salida usable!\n" +msgstr "video_out_directfb: ¡la capa no soporta YUV2!\n" #: src/video_out/video_out_directfb.c:1557 msgid "" "video_out_directfb:need at least DirectFB 0.9.25 to play on this layer!\n" msgstr "" +"video_out_directfb:¡se necesita al menos DirectFB 0.9.25 para reproducir en " +"esta capa!\n" #: src/video_out/video_out_directfb.c:1592 -#, fuzzy, c-format +#, c-format msgid "video_out_directfb: layer doesn't support buffermode %d!\n" -msgstr "video_out_directfb: ¡no se encontró una capa de salida usable!\n" +msgstr "video_out_directfb: ¡la capa no soporta modo tamponeado %d!\n" #: src/video_out/video_out_directfb.c:1598 #, c-format msgid "video_out_directfb: layer doesn't support options 0x%08x!\n" -msgstr "" +msgstr "video_out_directfb: ¡la capa no soporta las opciones 0x%08x!\n" #: src/video_out/video_out_directfb.c:1692 msgid "video_out_directfb: using hardware accelerated image scaling.\n" @@ -3925,9 +3940,8 @@ msgstr "" "hardware.\n" #: src/video_out/video_out_directfb.c:1782 -#, fuzzy msgid "video layer id (auto: -1)" -msgstr "id de la capa de vÃdeo" +msgstr "id. de la capa de vÃdeo (auto: -1)" #: src/video_out/video_out_directfb.c:1783 msgid "Select the video output layer by its id." @@ -3935,20 +3949,18 @@ msgstr "Seleccione la capa de salida de vÃdeo por su id." #: src/video_out/video_out_directfb.c:1804 #: src/video_out/video_out_directfb.c:2014 -#, fuzzy, c-format +#, c-format msgid "video_out_directfb: using display layer #%d.\n" -msgstr "" -"video_out_directfb: ¡no se encontró una capa de superposición usable!\n" +msgstr "video_out_directfb: usando capa de visualización nº %d.\n" #: src/video_out/video_out_directfb.c:1888 msgid "xine video output plugin using DirectFB." msgstr "complemento de xine de salida de vÃdeo usando DirectFB." #: src/video_out/video_out_directfb.c:2007 -#, fuzzy msgid "video_out_directfb: no usable display layer was found!\n" msgstr "" -"video_out_directfb: ¡no se encontró una capa de superposición usable!\n" +"video_out_directfb: ¡no se encontró una capa de visualización usable!\n" #: src/video_out/video_out_directfb.c:2096 msgid "xine video output plugin using DirectFB under XDirectFB." @@ -4009,16 +4021,17 @@ msgstr "" "Disminuyendo\n" " la resolución del tampón de cuadro podrÃa ayudar.\n" +# Cer: panning --> panoramizado +# frame flips --> volteos de cuadro +# Zero copy buffers --> tampones copia cero #: src/video_out/video_out_fb.c:969 -#, fuzzy msgid "" "WARNING: video_out_fb: Zero copy buffers are DISABLED because kernel driver\n" " do not support screen panning (used for frame flips).\n" msgstr "" -"AVISO: video_out_fb: Tampones Zero copy (copia Cero) están DESACTIVADOS " -"porque el driver del kernel\n" -" no soporta panoramizado (panning) de pantalla (usado para volteos de " -"cuadro (frame flips)).\n" +"AVISO: video_out_fb: Los tampones copia cero están DESACTIVADOS porque el " +"driver del kernel\n" +" no soporta panoramizado de pantalla (usado para volteos de cuadro ).\n" #: src/video_out/video_out_fb.c:1038 #, c-format @@ -4152,6 +4165,7 @@ msgstr "" "video_out_pgx32: Error: '%s' no es un dispositivo tampón de cuadro " "(framebuffer) pgx32\n" +# Cer: Mmm, coger :-? #: src/video_out/video_out_pgx64.c:281 msgid "video_out_pgx64: Error: can't grab DGA drawable for video window\n" msgstr "" @@ -4271,52 +4285,57 @@ msgstr "" #: src/video_out/video_out_sdl.c:562 msgid "video_out_sdl: fullscreen mode is NOT supported\n" -msgstr "" +msgstr "video_out_sdl: el modo de pantalla completa NO está soportado\n" -# CER, traducción incierta +# Cer: traducción incierta #: src/video_out/video_out_sdl.c:573 -#, fuzzy msgid "xine video output plugin using the Simple Direct Media Layer" msgstr "" -"complemento de xine de salida de vÃdeo usando la Capa Simple Media Directo" +"complemento de xine de salida de vÃdeo usando la Capa Simple de Medios " +"Directo" #: src/video_out/video_out_stk.c:454 msgid "xine video output plugin using the Libstk Surface Set-top Toolkit" -msgstr "xine video output plugin using the Libstk Surface Set-top Toolkit" +msgstr "" +"complemento de vÃdeo de xine usando el \"Libstk Surface Set-top Toolkit\"" #: src/video_out/video_out_syncfb.c:282 msgid "video_out_syncfb: error. (YUY2 not supported by your graphic card)\n" msgstr "" +"video_out_syncfb: error. (YUY2 no está soportado por su tarjeta gráfica)\n" #: src/video_out/video_out_syncfb.c:298 msgid "video_out_syncfb: error. (YV12 not supported by your graphic card)\n" msgstr "" +"video_out_syncfb: error. (YV12 no está soportado por su tarjeta gráfica)\n" #: src/video_out/video_out_syncfb.c:940 msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:0 (3 plane))\n" -msgstr "" +msgstr "video_out_syncfb: info. (módulo SyncFB soporta YUV 4:2:0 (3 planos))\n" #: src/video_out/video_out_syncfb.c:945 msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:0 (2 plane))\n" -msgstr "" +msgstr "video_out_syncfb: info. (módulo SyncFB soporta YUV 4:2:0 (2 planos))\n" #: src/video_out/video_out_syncfb.c:950 msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:2)\n" -msgstr "" +msgstr "video_out_syncfb: info. (módulo SyncFB soporta YUV 4:2:2)\n" #: src/video_out/video_out_syncfb.c:956 msgid "video_out_syncfb: info. (SyncFB module supports YUY2)\n" -msgstr "" +msgstr "video_out_syncfb: info. (módulo SyncFB soporta YUY2)\n" #: src/video_out/video_out_syncfb.c:963 msgid "video_out_syncfb: info. (SyncFB module supports RGB565)\n" -msgstr "" +msgstr "video_out_syncfb: info. (módulo SyncFB soporta RGB565)\n" #: src/video_out/video_out_syncfb.c:968 msgid "" "video_out_syncfb: aborting. (SyncFB module does not support YV12, YUY2 nor " "RGB565)\n" msgstr "" +"video_out_syncfb: abortando. (módulo SyncFB no soporta YV12, YUY2 ni " +"RGB565)\n" #: src/video_out/video_out_syncfb.c:987 msgid "" @@ -4324,25 +4343,32 @@ msgid "" "because your SyncFB kernel module seems to be outdated. Please refer to " "README.syncfb for informations on how to update it.)\n" msgstr "" +"video_out_syncfb: info. (control de brillo/contraste no estará disponible " +"porque su módulo del kernel SyncFB parece estar anticuado. Por favor, " +"refiérase a README.syncfb para información sobre como actualizarlo.)\n" #: src/video_out/video_out_syncfb.c:1011 msgid "default number of frame repetitions" -msgstr "" +msgstr "número por defecto de repeticiones de cuadros" #: src/video_out/video_out_syncfb.c:1012 msgid "" "This specifies how many times a single video frame will be displayed " "consecutively." msgstr "" +"Esto especifica cuantas veces se mostrará consecutivamente el mismo cuadro " +"de vÃdeo." #: src/video_out/video_out_syncfb.c:1060 msgid "" "xine video output plugin using the SyncFB module for Matrox G200/G400 cards" msgstr "" +"complemento de vÃdeo de xine usando el módulo SyncFB para tarjetas Matrox " +"G200/G400" #: src/video_out/video_out_syncfb.c:1078 msgid "SyncFB device name" -msgstr "" +msgstr "Nombre de dispositivo de SyncFB" #: src/video_out/video_out_syncfb.c:1079 msgid "" @@ -4351,30 +4377,36 @@ msgid "" "xine can be used to fill this file with arbitrary content. So you should be " "careful that the value you enter really is a proper framebuffer device." msgstr "" +"Especifica el nombre de fichero para el dispositivo SyncFB (TeleTux) a ser " +"usado.\n" +"Este ajuste es crÃtico para la seguridad, porque cuando se cambia a un " +"fichero diferente, xine puede usarse para llenar este fichero con contenido " +"arbitrario. Asà que debiera ser cuidadoso con que el valor que introduzca " +"sea realmente un dispositivo framebuffer adecuado." #: src/video_out/video_out_vidix.c:993 msgid "red intensity" -msgstr "" +msgstr "intensidad de rojo " #: src/video_out/video_out_vidix.c:993 msgid "The intensity of the red colour components." -msgstr "" +msgstr "La intensidad de los componentes de color rojo." #: src/video_out/video_out_vidix.c:998 msgid "green intensity" -msgstr "" +msgstr "intensidad de verde" #: src/video_out/video_out_vidix.c:998 msgid "The intensity of the green colour components." -msgstr "" +msgstr "La intensidad de los componentes de color verde." #: src/video_out/video_out_vidix.c:1003 msgid "blue intensity" -msgstr "" +msgstr "intensidad de azul" #: src/video_out/video_out_vidix.c:1003 msgid "The intensity of the blue colour components." -msgstr "" +msgstr "La intensidad de los componentes de color azul." #: src/video_out/video_out_vidix.c:1016 src/video_out/video_out_xcbxv.c:1473 #: src/video_out/video_out_xv.c:1531 src/video_out/video_out_xvmc.c:1462 @@ -4384,31 +4416,36 @@ msgid "" "repainting of the entire screen (\"vertical retrace\"). This eliminates " "flickering and tearing artifacts, but will use more graphics memory." msgstr "" +"El doble tamponeado sincronizará la actualización de la imagen de vÃdeo al " +"redibujado de la pantalla de video entera (\"vertical retrace\", retrazado " +"vertical). Esto elimina el parpadeo y artifactos de rajado, pero usa más " +"memoria gráfica." #: src/video_out/video_out_vidix.c:1063 msgid "video_out_vidix: adaptor supports the yuy2 format\n" -msgstr "" +msgstr "video_out_vidix: el adaptador soporta el formato yuy2\n" #: src/video_out/video_out_vidix.c:1074 msgid "video_out_vidix: adaptor supports the yv12 format\n" -msgstr "" +msgstr "video_out_vidix: el adaptador soporta el formato yv12\n" #: src/video_out/video_out_vidix.c:1090 msgid "video_out_vidix: You have wrong version of VIDIX library\n" msgstr "" +"video_out_vidix: Tiene usted la versión incorrecta de la librerÃa VIDIX\n" #: src/video_out/video_out_vidix.c:1098 msgid "video_out_vidix: Couldn't find working VIDIX driver\n" -msgstr "" +msgstr "video_out_vidix: No pude localizar el driver VIDIX que funcione\n" #: src/video_out/video_out_vidix.c:1111 #, c-format msgid "video_out_vidix: using driver: %s by %s\n" -msgstr "" +msgstr "video_out_vidix: usando driver: %s por %s\n" #: src/video_out/video_out_vidix.c:1158 msgid "video overlay colour key red component" -msgstr "" +msgstr "clave de componente rojo en superposición de vÃdeo" #: src/video_out/video_out_vidix.c:1159 src/video_out/video_out_vidix.c:1166 #: src/video_out/video_out_vidix.c:1173 src/video_out/video_out_xcbxv.c:1440 @@ -4418,22 +4455,26 @@ msgid "" "The colour key is used to tell the graphics card where to overlay the video " "image. Try different values, if you experience windows becoming transparent." msgstr "" +"La llave de color se usa para decirle a la tarjeta gráfica donde superponer " +"la imagen de vÃdeo. Pruebe diferentes valores si observa que las ventanas se " +"vuelven transparentes." #: src/video_out/video_out_vidix.c:1165 msgid "video overlay colour key green component" -msgstr "" +msgstr "clave de componente verde en superposición de vÃdeo" #: src/video_out/video_out_vidix.c:1172 msgid "video overlay colour key blue component" -msgstr "" +msgstr "clave de componente azul en superposición de vÃdeo" #: src/video_out/video_out_vidix.c:1204 msgid "xine video output plugin using libvidix for x11" -msgstr "" +msgstr "complemento de salida de vÃdeo usando libvidix para x11" #: src/video_out/video_out_vidix.c:1286 msgid "xine video output plugin using libvidix for linux frame buffer" msgstr "" +"complemento de salida de vÃdeo usando libvidix para frame buffer de linux" #: src/video_out/video_out_xcbshm.c:157 #, c-format @@ -4441,6 +4482,9 @@ msgid "" "video_out_xcbshm: %s: allocating image\n" "video_out_xcbshm: => not using MIT Shared Memory extension.\n" msgstr "" +"video_out_xcbshm: %s: ubicando imagen\n" +"video_out_xcbshm: => no usando la extensión de memoria compartida MIT (MIT " +"Shared Memory).\n" #: src/video_out/video_out_xcbshm.c:166 msgid "" @@ -4448,12 +4492,20 @@ msgid "" "image \n" "video_out_xcbshm: => not using MIT Shared Memory extension.\n" msgstr "" +"video_out_xcbshm: error de memoria compartida (error de dirección) ) al " +"ubicar imagen\n" +"video_out_xcbshm: => no usando la extensión de memoria compartida MIT (MIT " +"Shared Memory).\n" #: src/video_out/video_out_xcbshm.c:177 msgid "" "video_out_xcbshm: x11 error during shared memory XImage creation\n" "video_out_xcbshm: => not using MIT Shared Memory extension.\n" msgstr "" +"video_out_xcbshm: x11 error durante creación de XImage en memoria " +"compartida\n" +"video_out_xcbshm: => no usando la extensión de memoria compartida MIT (MIT " +"Shared Memory).\n" #: src/video_out/video_out_xcbshm.c:1100 src/video_out/video_out_xshm.c:1157 #, c-format @@ -4464,25 +4516,36 @@ msgid "" "a depth of 16 bpp is recommended!\n" "\n" msgstr "" +"\n" +"\n" +"AVISO: la profundidad actual de la pantalla es %d. ¡Para el mejor\n" +"rendimiento se recomienda una profundidad de 16 bpp!\n" +"\n" #: src/video_out/video_out_xcbshm.c:1113 msgid "video_out_xcbshm: MIT shared memory extension not present on display.\n" msgstr "" +"video_out_xcbshm: la extensión de memoria compartida del MIT (MIT Shared " +"Memory) no está presente en la pantalla.\n" #: src/video_out/video_out_xcbshm.c:1212 -#, fuzzy msgid "video_out_xcbshm: your video mode was not recognized, sorry :-(\n" -msgstr "video_out_fb: Lo sentimos, su modo de vÃdeo no fue reconocido .\n" +msgstr "video_out_xcbshm: su modo de vÃdeo no fué reconocido, lo siento :-(\n" #: src/video_out/video_out_xcbshm.c:1242 src/video_out/video_out_xshm.c:1303 msgid "xine video output plugin using the MIT X shared memory extension" msgstr "" +"complemento de salida de vÃdeo de xine usando la extensión de memoria " +"compartida del MIT (MIT Shared Memory) " #: src/video_out/video_out_xcbxv.c:270 msgid "" "video_out_xcbxv: XvShmCreateImage returned a zero size\n" "video_out_xcbxv: => not using MIT Shared Memory extension.\n" msgstr "" +"video_out_xcbxv: XvShmCreateImage retornó un tamaño cero\n" +"video_out_xcbxv: => no usando la extensión de memoria compartida MIT (MIT " +"Shared Memory).\n" #: src/video_out/video_out_xcbxv.c:279 #, c-format @@ -4490,16 +4553,22 @@ msgid "" "video_out_xcbxv: shared memory error in shmget: %s\n" "video_out_xcbxv: => not using MIT Shared Memory extension.\n" msgstr "" +"video_out_xcbxv: error de memoria compartida en shmget: %s\n" +"video_out_xcbxv: => no usando la extensión de memoria compartida MIT (MIT " +"Shared Memory).\n" #: src/video_out/video_out_xcbxv.c:298 msgid "" "video_out_xcbxv: x11 error during shared memory XImage creation\n" "video_out_xcbxv: => not using MIT Shared Memory extension.\n" msgstr "" +"video_out_xcbxv: x11 error durante creación de XImage en memoria compartida\n" +"video_out_xcbxv: => no usando la extensión de memoria compartida MIT (MIT " +"Shared Memory).\n" #: src/video_out/video_out_xcbxv.c:1291 msgid "video_out_xcbxv: Xv extension not present.\n" -msgstr "" +msgstr "video_out_xcbxv: la extensión Xv no está presente.\n" #: src/video_out/video_out_xcbxv.c:1333 msgid "" @@ -4508,6 +4577,9 @@ msgid "" " Looks like your graphics hardware driver doesn't support " "Xv?!\n" msgstr "" +"video_out_xcbxv: la extensión Xv está presente pero no pude encontrar un " +"puerto yuv12 usable.\n" +" ¡¿Parece que su driver de hardware gráfico no soporta Xv?!\n" #: src/video_out/video_out_xcbxv.c:1341 #, c-format @@ -4515,21 +4587,23 @@ msgid "" "video_out_xcbxv: using Xv port %d from adaptor %s for hardware colorspace " "conversion and scaling.\n" msgstr "" +"video_out_xcbxv: usando puerto Xv %d del adaptador %s para conversión y " +"escalado de espacio de color en hardware .\n" #: src/video_out/video_out_xcbxv.c:1448 src/video_out/video_out_xv.c:1506 #: src/video_out/video_out_xvmc.c:1455 src/video_out/video_out_xxmc.c:2545 msgid "autopaint colour key" -msgstr "" +msgstr "llave de color autopintado" #: src/video_out/video_out_xcbxv.c:1449 src/video_out/video_out_xv.c:1507 #: src/video_out/video_out_xvmc.c:1456 src/video_out/video_out_xxmc.c:2546 msgid "Make Xv autopaint its colorkey." -msgstr "" +msgstr "Hacer Xv autopintar su llave de color." #: src/video_out/video_out_xcbxv.c:1456 src/video_out/video_out_xv.c:1514 #: src/video_out/video_out_xxmc.c:2553 msgid "bilinear scaling mode" -msgstr "" +msgstr "modo de escalado bilineal" #: src/video_out/video_out_xcbxv.c:1457 src/video_out/video_out_xv.c:1515 #: src/video_out/video_out_xxmc.c:2554 @@ -4546,31 +4620,42 @@ msgid "" "1 - horizontal linear filtering\n" "2 - enable full bilinear filtering" msgstr "" +"Selecciona el modo de escalado bilineal para las tarjetas Permedia. Los " +"valores individuales son:\n" +"\n" +"Permedia 2\n" +"0 - desactivar filtrado bilineal\n" +"1 - activar filtrado bilineal\n" +"\n" +"Permedia 3\n" +"0 - desactivar filtrado bilineal\n" +"1 - filtrado horizontal lineal\n" +"2 - sactivar filtrado bilineal completo" #: src/video_out/video_out_xcbxv.c:1509 -#, fuzzy msgid "video_out_xcbxv: this adaptor supports the yv12 format.\n" -msgstr "video_out_directfb: ¡no se encontró una capa de salida usable!\n" +msgstr "video_out_xcbxv: éste adaptador soporta el formato yv12.\n" #: src/video_out/video_out_xcbxv.c:1514 -#, fuzzy msgid "video_out_xcbxv: this adaptor supports the yuy2 format.\n" -msgstr "video_out_directfb: ¡no se encontró una capa de salida usable!\n" +msgstr "video_out_xcbxv: éste adaptador soporta el formato yuy2.\n" #: src/video_out/video_out_xcbxv.c:1522 src/video_out/video_out_xv.c:1591 #: src/video_out/video_out_xxmc.c:2638 msgid "pitch alignment workaround" -msgstr "" +msgstr "rodeo para alineamiento de paso" #: src/video_out/video_out_xcbxv.c:1523 src/video_out/video_out_xv.c:1592 #: src/video_out/video_out_xxmc.c:2639 msgid "Some buggy video drivers need a workaround to function properly." msgstr "" +"Algunos drivers de vÃdeo con errores necesitan un rodeo para que funcionen " +"adecuadamente." #: src/video_out/video_out_xcbxv.c:1529 src/video_out/video_out_xv.c:1598 #: src/video_out/video_out_xvmc.c:1524 msgid "deinterlace method (deprecated)" -msgstr "" +msgstr "método de desentrelazado (obsolescente)" #: src/video_out/video_out_xcbxv.c:1530 src/video_out/video_out_xv.c:1599 #: src/video_out/video_out_xvmc.c:1525 @@ -4610,17 +4695,57 @@ msgid "" "Applies a slight vertical blur to remove the comb artifacts. Good results " "with medium CPU usage." msgstr "" +"Este ajuste de configuración es obsolescente. DeberÃa usar los ajustes del " +"postprocesado de desentrelazado nuevo en su lugar.\n" +"\n" +"De los antiguos dias de la televisión analógica, donde las lineas pares e " +"impares de los cuadros de vÃdeo se visualizan en tiempos distintos viene la " +"idea de mejorar el suavizado del movimiento grabando también las lineas en " +"tiempos distintos. Esto se llama \"entrelazado\". Pero desafortunadamente, " +"las pantallas cotidianas muestran las lineas pares e impares como un cuadro " +"completo, todas de golpe (se llama \"progressive display\", visualización " +"progresiva), lo que resulta en feos errores de cuadro conocidos como " +"artifactos de peine. Desentrelazado en software es un which results in ugly " +"frame errors known as comb artifacts. Software deinterlacing is an enfoque " +"para reducir estos artifactos. Los valores individuales son:\n" +"\n" +"none (nada)\n" +"Desactiva el desentrelazado en software.\n" +"\n" +"bob\n" +"Interpola entre las lineas para las partes en movimiento de la imagen.\n" +"\n" +"weave (tejido)\n" +"Similar a bob, pero con tendencia a preservar la resolución completa, mejor " +"para mayor detalle de las escenas con poco movimiento.\n" +"\n" +"greedy (codicioso)\n" +"Desentrelazador adaptativo muy bueno, pero necesita un montón de potencia de " +"CPU.\n" +"\n" +"onefield (un campo)\n" +"Siempre interpoa y reduce la resolución vertical.\n" +"\n" +"onefieldxv\n" +"Igual que onefield, pero hace la interpolación en hardware.\n" +"\n" +"linearblend (mezcla lineal)\n" +"Aplica un ligero borrón vertical para eliminar los artifactos de peine. " +"Buenos resultados con uso de CPU mediano." #: src/video_out/video_out_xcbxv.c:1584 src/video_out/video_out_xv.c:1672 #: src/video_out/video_out_xxmc.c:2733 msgid "xine video output plugin using the MIT X video extension" -msgstr "" +msgstr "complemento de salida de vÃdeo usando la extensión MIT X vÃdeo" #: src/video_out/video_out_xshm.c:202 msgid "" "video_out_xshm: shared memory error when allocating image\n" "video_out_xshm: => not using MIT Shared Memory extension.\n" msgstr "" +"video_out_xshm: error de memoria compartida al ubizar imagen\n" +"video_out_xshm: => no usando la extensión de memoria compartida MIT (MIT " +"Shared Memory).\n" #: src/video_out/video_out_xshm.c:218 #, c-format @@ -4628,38 +4753,56 @@ msgid "" "video_out_xshm: %s: allocating image\n" "video_out_xshm: => not using MIT Shared Memory extension.\n" msgstr "" +"video_out_xshm: %s: ubicando imagen\n" +"video_out_xshm: => no usando la extensión de memoria compartida MIT (MIT " +"Shared Memory).\n" #: src/video_out/video_out_xshm.c:228 msgid "" "video_out_xshm: shared memory error (address error) when allocating image \n" "video_out_xshm: => not using MIT Shared Memory extension.\n" msgstr "" +"video_out_xshm: error de memoria compartida (error de dirección) al ubicar " +"imagen\n" +"video_out_xshm: => no usando la extensión de memoria compartida MIT (MIT " +"Shared Memory).\n" #: src/video_out/video_out_xshm.c:245 msgid "" "video_out_xshm: x11 error during shared memory XImage creation\n" "video_out_xshm: => not using MIT Shared Memory extension.\n" msgstr "" +"video_out_xshm: x11 error durante creación de XImage en memoria compartida\n" +"video_out_xshm: => no usando la extensión de memoria compartida MIT (MIT " +"Shared Memory).\n" #: src/video_out/video_out_xshm.c:1170 msgid "video_out_xshm: MIT shared memory extension not present on display.\n" msgstr "" +"video_out_xshm: la extensión de memoria compartida del MIT (MIT Shared " +"Memory) no está presente en la pantalla.\n" #: src/video_out/video_out_xshm.c:1254 msgid "video_out_xshm: your video mode was not recognized, sorry :-(\n" -msgstr "" +msgstr "video_out_xshm: su modo de vÃdeoo no fué reconocido, lo siento :-(\n" #: src/video_out/video_out_xv.c:298 msgid "" "video_out_xv: XvShmCreateImage failed\n" "video_out_xv: => not using MIT Shared Memory extension.\n" msgstr "" +"video_out_xv: falló XvShmCreateImage\n" +"video_out_xv: => no usando la extensión de memoria compartida MIT (MIT " +"Shared Memory).\n" #: src/video_out/video_out_xv.c:324 msgid "" "video_out_xv: XvShmCreateImage returned a zero size\n" "video_out_xv: => not using MIT Shared Memory extension.\n" msgstr "" +"video_out_xv: XvShmCreateImage retornó un tamaño cero\n" +"video_out_xv: => no usando la extensión de memoria compartida MIT (MIT " +"Shared Memory).\n" #: src/video_out/video_out_xv.c:332 #, c-format @@ -4667,16 +4810,22 @@ msgid "" "video_out_xv: shared memory error in shmget: %s\n" "video_out_xv: => not using MIT Shared Memory extension.\n" msgstr "" +"video_out_xv: error de memoria compartida en shmget: %s\n" +"video_out_xv: => no usando la extensión de memoria compartida MIT (MIT " +"Shared Memory).\n" #: src/video_out/video_out_xv.c:364 msgid "" "video_out_xv: x11 error during shared memory XImage creation\n" "video_out_xv: => not using MIT Shared Memory extension.\n" msgstr "" +"video_out_xv: x11 error durante creación de XImage en memoria compartida\n" +"video_out_xv: => no usando la extensión de memoria compartida MIT (MIT " +"Shared Memory).\n" #: src/video_out/video_out_xv.c:1343 msgid "video_out_xv: Xv extension not present.\n" -msgstr "" +msgstr "video_out_xv: la extensión Xv no está presente.\n" #: src/video_out/video_out_xv.c:1380 msgid "" @@ -4684,6 +4833,9 @@ msgid "" "port.\n" " Looks like your graphics hardware driver doesn't support Xv?!\n" msgstr "" +"video_out_xv: la extensión Xv está presente pero no pude encontrar un " +"puerto yuv12 usable.\n" +" ¡¿Parece que su driver de hardware gráfico no soporta Xv?!\n" #: src/video_out/video_out_xv.c:1389 #, c-format @@ -4691,28 +4843,32 @@ msgid "" "video_out_xv: using Xv port %ld from adaptor %s for hardware colorspace " "conversion and scaling.\n" msgstr "" +"video_out_xv: usando puerto Xv %ld del adaptador %s para conversión y " +"escalado de espacio de color en hardware .\n" #: src/video_out/video_out_xv.c:1564 msgid "video_out_xv: this adaptor supports the yv12 format.\n" -msgstr "" +msgstr "video_out_xv: éste adaptador soporta el formato yv12.\n" #: src/video_out/video_out_xv.c:1569 msgid "video_out_xv: this adaptor supports the yuy2 format.\n" -msgstr "" +msgstr "video_out_xv: éste adaptador soporta el formato yuy2.\n" #: src/video_out/video_out_xvmc.c:1593 msgid "xine video output plugin using the XvMC X video extension" -msgstr "" +msgstr "complemento de vÃdeo de xine usando extensión de vÃdeo X XvMC" #: src/video_out/video_out_xvmc.c:1639 msgid "video_out_xvmc: XvMC extension not present.\n" -msgstr "" +msgstr "video_out_xvmc: extensión XvMC no presente.\n" #: src/video_out/video_out_xvmc.c:1737 msgid "" "video_out_xvmc: Xv extension is present but I couldn't find a usable yuv12 " "port.\n" msgstr "" +"video_out_xvmc: la extensión Xv está presente pero no pude encontrar un " +"puerto yuv12 usable.\n" #: src/video_out/video_out_xvmc.c:1746 #, c-format @@ -4720,35 +4876,43 @@ msgid "" "video_out_xvmc: using Xv port %ld from adaptor %s\n" " for hardware colorspace conversion and scaling\n" msgstr "" +"video_out_xvmc: usando puerto %ld de Xv del adaptador %s\n" +" para conversión del espacio de color y escalado en hardware\n" #: src/video_out/video_out_xvmc.c:1751 msgid " idct and motion compensation acceleration \n" -msgstr "" +msgstr " compensación de movimiento y aceleración idct \n" #: src/video_out/video_out_xvmc.c:1753 msgid " motion compensation acceleration only\n" -msgstr "" +msgstr " sólo compensación de aceleración \n" #: src/video_out/video_out_xvmc.c:1755 msgid " no XvMC support \n" -msgstr "" +msgstr " sin soporte XvMC \n" #: src/video_out/video_out_xvmc.c:1756 #, c-format msgid " With Overlay = %d; UnsignedIntra = %d.\n" -msgstr "" +msgstr " Con Overlay = %d; UnsignedIntra = %d.\n" #: src/video_out/video_out_xxmc.c:650 msgid "" "video_out_xxmc: XvShmCreateImage failed\n" "video_out_xxmc: => not using MIT Shared Memory extension.\n" msgstr "" +"video_out_xxmc: falló XvShmCreateImage \n" +"video_out_xxmc: => no se usará la extensión \"MIT Shared Memory\" (memoria " +"compartida MIT).\n" #: src/video_out/video_out_xxmc.c:660 msgid "" "video_out_xxmc: XvShmCreateImage returned a zero size\n" "video_out_xxmc: => not using MIT Shared Memory extension.\n" msgstr "" +"video_out_xxmc: XvShmCreateImage retornó un tamaño cero\n" +"video_out_xxmc: => no se usará la extensión \"MIT Shared Memory\" (memoria " +"compartida MIT).\n" #: src/video_out/video_out_xxmc.c:668 #, c-format @@ -4756,16 +4920,23 @@ msgid "" "video_out_xxmc: shared memory error in shmget: %s\n" "video_out_xxmc: => not using MIT Shared Memory extension.\n" msgstr "" +"video_out_xxmc: error de memoria compartida en \"shmget\": %s\n" +"video_out_xxmc: => no se usará la extensión \"MIT Shared Memory\" (memoria " +"compartida MIT).\n" #: src/video_out/video_out_xxmc.c:700 msgid "" "video_out_xxmc: x11 error during shared memory XImage creation\n" "video_out_xxmc: => not using MIT Shared Memory extension.\n" msgstr "" +"video_out_xxmc: x11 error durante la creación de \"XImage\" en memoria " +"compartida\n" +"video_out_xxmc: => no se usará la extensión \"MIT Shared Memory\" (memoria " +"compartida MIT).\n" #: src/video_out/video_out_xxmc.c:2388 msgid "video_out_xxmc: Xv extension not present.\n" -msgstr "" +msgstr "video_out_xxmc: extensión Xv no presente.\n" #: src/video_out/video_out_xxmc.c:2425 msgid "" @@ -4773,6 +4944,10 @@ msgid "" "port.\n" " Looks like your graphics hardware driver doesn't support Xv?!\n" msgstr "" +"video_out_xxmc: la extensión Xv está presente pero no pude encontrar un " +"puerto yuv12 usable.\n" +" ¿Parece como que su driver de hardware gráfico no soporta " +"Xv?!\n" #: src/video_out/video_out_xxmc.c:2434 #, c-format @@ -4780,18 +4955,20 @@ msgid "" "video_out_xxmc: using Xv port %ld from adaptor %s for hardware colorspace " "conversion and scaling.\n" msgstr "" +"video_out_xxmc: usando el puerto %ld de Xv del adaptador %s para conversión " +"y escalado del espacio de color en hardware.\n" #: src/video_out/video_out_xxmc.c:2610 msgid "video_out_xxmc: this adaptor supports the yv12 format.\n" -msgstr "" +msgstr "video_out_xxmc: éste adaptador soporta el formato yv12.\n" #: src/video_out/video_out_xxmc.c:2615 msgid "video_out_xxmc: this adaptor supports the yuy2 format.\n" -msgstr "" +msgstr "video_out_xxmc: éste adaptador soporta el formato yuy2.\n" #: src/video_out/video_out_xxmc.c:2644 msgid "Make XvMC allocate more frames for better buffering." -msgstr "" +msgstr "Hacer que XvMC ubique más cuadros more cuadros para mejor tamponeado." #: src/video_out/video_out_xxmc.c:2645 msgid "" @@ -4799,10 +4976,13 @@ msgid "" "This option, when turned on, makes the driver try to\n" "allocate 15 frames. A must for unichrome and live VDR.\n" msgstr "" +"Algunas implementaciones XvMC permiten más de 8 cuadros.\n" +"Esta opción, cuando se activa, hace que el manejador trate de\n" +"ubicar 15 cuadros. hay que tenerlo para VDR uni cromático y en vivo.\n" #: src/video_out/video_out_xxmc.c:2651 msgid "Unichrome cpu save" -msgstr "" +msgstr "Ahorro de cpu unichrome" #: src/video_out/video_out_xxmc.c:2652 msgid "" @@ -4810,64 +4990,84 @@ msgid "" "Only for Linux kernel 2.6 series or 2.4 with multimedia patch.\n" "Experimental.\n" msgstr "" +"Ahorra tiempo de CPU durmiendo mientras trabaja el decodificador.\n" +"Sólo para Linux con kernel serie 2.6 series o 2.4 con parche multimedia.\n" +"Experimental.\n" #: src/video_out/video_out_xxmc.c:2658 msgid "Fix buggy NVIDIA XvMC subpicture colors" -msgstr "" +msgstr "Arreglar colores de subimagen en NVIDIA XvMC con errores" #: src/video_out/video_out_xxmc.c:2659 msgid "" "There's a bug in NVIDIA's XvMC lib that makes red OSD colors\n" "look blue and vice versa. This option provides a workaround.\n" msgstr "" +"Hay un bug en la librerÃa XvMC de NVIDIA que hace que el color \n" +"rojo en el DEP aparezca como azul y viceversa.\n" +"Esta opción proporciona un arreglo.\n" #: src/video_out/video_out_xxmc.c:2664 msgid "Use bob as accelerated deinterlace method." -msgstr "" +msgstr "Use «bob» como método acelerado de desentrelazado." #: src/video_out/video_out_xxmc.c:2665 msgid "" "When interlacing is enabled for hardware accelerated frames,\n" "alternate between top and bottom field at double the frame rate.\n" msgstr "" +"Cuando el entrelazado está activado para cuadros acelerados \n" +"en hardware, alterna entre el campo superior e inferior \n" +"al doble de la frecuencia de cuadro.\n" #: src/video_out/video_out_xxmc.c:2671 msgid "Don't use bob deinterlacing for progressive frames." -msgstr "" +msgstr "No usar desentrelazado «bob» para cuadros progresivos." #: src/video_out/video_out_xxmc.c:2672 msgid "" "Progressive frames don't need deinterlacing, so disabling it on\n" "demand should result in a better picture.\n" msgstr "" +"Los cuadros progresivos no necesitan desentrelazado, de manera\n" +"que desentrelazarlos bajo demanda no resultará en una mejor imagen.\n" #: src/video_out/video_out_xxmc.c:2678 msgid "Don't use bob deinterlacing while a scaled OSD is active." msgstr "" +"No usar desentrelazado «bob» mientras una escalado de VEP (OSD) está activo." #: src/video_out/video_out_xxmc.c:2679 msgid "" "Bob deinterlacing adds some noise to horizontal lines, so disabling it\n" "on demand should result in a better OSD picture.\n" msgstr "" +"El desentrelazado «bob» añade algún ruido a las lineas horizontales,\n" +"de manera que desactivarlo bajo demanda deberÃa resultar en una\n" +"mejor imagen VEP (visualización en pantalla, OSD)\n" #: src/video_out/x11osd.c:276 src/video_out/xcbosd.c:270 msgid "x11osd: XShape extension not available. unscaled overlay disabled.\n" msgstr "" +"x11osd: extensión XShape no disponible. Superposición no escalada " +"desactivada.\n" #: src/video_out/x11osd.c:289 src/video_out/xcbosd.c:283 msgid "x11osd: error creating window. unscaled overlay disabled.\n" msgstr "" +"x11osd: error al crear ventana . Superposición no escalada desactivada.\n" #: src/video_out/x11osd.c:297 src/video_out/x11osd.c:338 #: src/video_out/xcbosd.c:293 msgid "x11osd: error creating pixmap. unscaled overlay disabled.\n" msgstr "" +"x11osd: error al crear pixmap (mapa de pÃxeles). Superposición no escalada " +"desactivada.\n" #: src/video_out/x11osd.c:348 src/video_out/xcbosd.c:332 #, c-format msgid "x11osd: unscaled overlay created (%s mode).\n" -msgstr "" +msgstr "x11osd: superposición no escalada creada (modo %s).\n" #: src/xine-engine/alphablend.c:2146 msgid "disable exact alpha blending of overlays" @@ -4890,16 +5090,16 @@ msgstr "" #: src/xine-engine/audio_decoder.c:367 #, c-format msgid "audio_decoder: no plugin available to handle '%s'\n" -msgstr "" +msgstr "audio_decoder: no hay disponible complemento para manejar '%s'\n" #: src/xine-engine/audio_decoder.c:384 #, c-format msgid "audio_decoder: error, unknown buffer type: %08x\n" -msgstr "" +msgstr "audio_decoder: error, tipo de tampón desconocido: %08x\n" #: src/xine-engine/audio_decoder.c:486 msgid "number of audio buffers" -msgstr "" +msgstr "número de tampones de audio" #: src/xine-engine/audio_decoder.c:487 msgid "" @@ -4907,31 +5107,39 @@ msgid "" "queue. Higher values mean smoother playback for unreliable inputs, but also " "increased latency and memory consumption." msgstr "" +"El número de tampones de memoria de audio (cada uno tiene 8k) que xine usa " +"en su propia cola. Valores más altos implican reproducción más suave de " +"entradas poco fiables, pero también aumentan la latencia y el consumo de " +"memoria." #: src/xine-engine/audio_out.c:1098 msgid "" "audio_out: delay calculation impossible with an unavailable audio device\n" msgstr "" +"audio_out: cálculo de retardo imposible con un dispositivo de sonido no " +"disponible\n" #: src/xine-engine/audio_out.c:1235 msgid "write to sound card failed. Assuming the device was unplugged.\n" msgstr "" +"la escritura a la tarjeta de sonido falló. Supondremos que el dispositivo se " +"desconectó.\n" #: src/xine-engine/audio_out.c:1407 msgid "8 bits not supported by driver, converting to 16 bits.\n" -msgstr "" +msgstr "8 bits no soportados por el driver, convirtiendo a 16 bits.\n" #: src/xine-engine/audio_out.c:1415 msgid "mono not supported by driver, converting to stereo.\n" -msgstr "" +msgstr "mono no soportado por el driver, convirtiendo a estéreo.\n" #: src/xine-engine/audio_out.c:1421 msgid "stereo not supported by driver, converting to mono.\n" -msgstr "" +msgstr "estéreo no soportado por el driver, convirtiendo a mono.\n" #: src/xine-engine/audio_out.c:2075 msgid "method to sync audio and video" -msgstr "" +msgstr "método para sincronizar audio y vÃdeo" #: src/xine-engine/audio_out.c:2076 msgid "" @@ -4955,10 +5163,29 @@ msgid "" "passthrough, where audio data is passed to an external decoder in digital " "form." msgstr "" +"Cuando se reproduce audio y vÃdeo, hay al menos dos lrelojes concernidos: el " +"reloj del sistema, con el cual se sincronizan los cuadros de vÃdeo, y el " +"reloj en el hardware de sonido, que determina la velocidad de reproducción " +"del sonido. Estos relojes nunca van a la misma velocidad, excepto en los " +"raros casos en los que son fÃsicamente idénticos. En general, los dos " +"relojes derivarán después de algún tiempo, por lo que xine ofrece dos " +"maneras de mantener sincronizados el audio y el vÃdeo:\n" +"\n" +"metronom feedback (realimentación metronómica)\n" +"Este es el método estándar, que se aplica a contrarestar la deriva de vÃdeo " +"tan pronto como la deriva de audio se ha acumulado por encima de un lÃmite.\n" +"\n" +"resample (remuestreo)\n" +"Para algún hardware de vÃdeo, que está limitado a una cadencia de cuadro " +"fija (como DXR3 o las otras tarjetas decodificadoras) lo de arriba no " +"funciona, porque el vÃdeo no puede derivar. Por tanto remuestreamos el flujo " +"de audio para hacerlo más largo o corto y compensar el error de deriva de " +"audio. Esto no funciona para para paso a través digital, donde los datos de " +"audio se pasan a un decodificador externo en forma digital." #: src/xine-engine/audio_out.c:2104 msgid "enable resampling" -msgstr "" +msgstr "activar remuestreo (resampling)" #: src/xine-engine/audio_out.c:2105 msgid "" @@ -4967,10 +5194,14 @@ msgid "" "you can select, whether resampling is enabled, disabled or used " "automatically when necessary." msgstr "" +"Cuando la cadencia de muestreo del audio decodificado no se ajusta a las " +"capacidades de su hardware de sonido, se requiere una adaptación denominada " +"\"remuestreo\". Aquà puede seleccionar si se activa el remuestreo, se " +"desactiva, o se usa automáticamente cuando sea necesario." #: src/xine-engine/audio_out.c:2112 msgid "always resample to this rate (0 to disable)" -msgstr "" +msgstr "siempre remuestrear a ésta cadencia (0 para desactivar)" #: src/xine-engine/audio_out.c:2113 msgid "" @@ -4978,10 +5209,13 @@ msgid "" "hardware. By setting a value other than zero here, you can force the audio " "stream to be resampled to the given rate." msgstr "" +"Algunos manejadores de audio no anuncian correctamente las capacidades del " +"hardware de audio. Poniendo este valor a algo distinto de cero aquÃ, puede " +"forzar el flujo de datos de audio a ser remuestreado a la cadencia dada." #: src/xine-engine/audio_out.c:2122 msgid "offset for digital passthrough" -msgstr "" +msgstr "compensación para paso a través digital" #: src/xine-engine/audio_out.c:2123 msgid "" @@ -4989,10 +5223,14 @@ msgid "" "you can enter a fixed offset here to compensate.\n" "The unit of the value is one PTS tick, which is the 90000th part of a second." msgstr "" +"Si usa un decodificador externo envolvente y el audio está adelantado o " +"retrasado respecto al vÃdeo, puede introducir aquà un desplazamiento fijo " +"para compensar.\n" +"Las unidades del valor es una marca PTS, que es 1/90000 segundo." #: src/xine-engine/audio_out.c:2132 msgid "play audio even on slow/fast speeds" -msgstr "" +msgstr "reproduzca vÃdeo incluso a velocidades lentas/rápidas" #: src/xine-engine/audio_out.c:2133 msgid "" @@ -5001,101 +5239,117 @@ msgid "" "pitch). If want to experiment preserving the pitch you may try the 'stretch' " "audio post plugin instead." msgstr "" +"Si activa esta opción, el audio se escuchará incluso cuando la velocidad de " +"reproducción no sea 1X. Por supuesto, sonará distorsionado (tono más agudo o " +"grave). Si desea experimentar preservando el tono, puede probar el " +"postcomplemento de sonido 'stretch' en su lugar." #: src/xine-engine/audio_out.c:2206 msgid "startup audio volume" -msgstr "" +msgstr "volumen de audio inicial" #: src/xine-engine/audio_out.c:2207 msgid "The overall audio volume set at xine startup." -msgstr "" +msgstr "El volumen de sonido al arrancar xine." #: src/xine-engine/audio_out.c:2210 msgid "restore volume level at startup" -msgstr "" +msgstr "restaurar el nivel del volumen al arrancar" #: src/xine-engine/audio_out.c:2211 msgid "If disabled, xine will not modify any mixer settings at startup." msgstr "" +"Si se desactiva, xine no modificará ningún ajuste del mezclador al arrancar." #: src/xine-engine/audio_out.c:2241 msgid "audio_out: sorry, this should not happen. please restart xine.\n" msgstr "" +"audio_out: lo siento, ésto no debiera ocurrir. Por favor reinicie xine.\n" #: src/xine-engine/buffer.c:67 #, c-format msgid "xine-lib: buffer.c: There has been a fatal error: TOO MANY FREE's\n" msgstr "" +"xine-lib: buffer.c: Ha ocurrido un error fatal: DEMASIADAS LIBERACIONES DE " +"MEMORIA (FREE'S)\n" #: src/xine-engine/configfile.c:936 #, c-format msgid "The current config file has been modified by a newer version of xine." msgstr "" +"El fichero actual de configuración ha sido modificado por una versión de " +"xine más nueva." #: src/xine-engine/configfile.c:1041 #, c-format msgid "configfile: WARNING: backing up configfile to %s failed\n" msgstr "" +"configfile: AVISO: la copia de seguridad del fichero de configuración a %s " +"falló\n" #: src/xine-engine/configfile.c:1042 msgid "configfile: WARNING: your configuration will not be saved\n" -msgstr "" +msgstr "configfile: AVISO: su configuración no será guardada\n" #: src/xine-engine/configfile.c:1141 #, c-format msgid "configfile: WARNING: writing configuration to %s failed\n" -msgstr "" +msgstr "configfile: AVISO: la escritura de la configuración a %s falló\n" #: src/xine-engine/configfile.c:1142 #, c-format msgid "configfile: WARNING: removing possibly broken config file %s\n" msgstr "" +"configfile: AVISO: eliminando fichero de configuración %s posiblemente roto\n" #: src/xine-engine/configfile.c:1143 #, c-format msgid "configfile: WARNING: you should check the backup file %s\n" -msgstr "" +msgstr "configfile: AVISO: deberÃa comprobar el fichero de respaldo %s\n" #: src/xine-engine/configfile.c:1278 #, c-format msgid "configfile: entry '%s' mustn't be modified from MRL\n" -msgstr "" +msgstr "configfile: la entrada '%s' no deberÃa ser modificada desde MRL\n" #: src/xine-engine/info_helper.c:230 msgid "info_helper: can't find out current locale character set\n" msgstr "" +"info_helper: no puedo encontrar el \"locale\" actual del juego de " +"caracteres\n" #: src/xine-engine/info_helper.c:244 #, c-format msgid "" "info_helper: unsupported conversion %s -> UTF-8, no conversion performed\n" msgstr "" +"info_helper: conversión no soportada %s -> UTF-8, conversión no realizada\n" #: src/xine-engine/input_cache.c:171 #, c-format msgid ": open() function should never be called\n" -msgstr "" +msgstr ": la función open() no debiera ser nunca llamada\n" #: src/xine-engine/input_cache.c:353 #, c-format msgid ": input plugin not defined!\n" -msgstr "" +msgstr ": ¡complemento de entrada no definido!\n" #: src/xine-engine/input_rip.c:140 src/xine-engine/input_rip.c:260 #, c-format msgid "input_rip: reading of saved data failed: %s\n" -msgstr "" +msgstr "input_rip: falló la lectura de los datos guardados: %s\n" #: src/xine-engine/input_rip.c:155 #, c-format msgid "input_rip: reading by input plugin failed\n" -msgstr "" +msgstr "input_rip: falló la lectura por complemento de entrada\n" #: src/xine-engine/input_rip.c:163 src/xine-engine/input_rip.c:292 #: src/xine-engine/input_rip.c:658 #, c-format msgid "input_rip: error writing to file %<PRIdMAX> bytes: %s\n" -msgstr "" +msgstr "input_rip: error escribiendo al fichero %<PRIdMAX> bytes: %s\n" #: src/xine-engine/input_rip.c:184 #, c-format @@ -5105,22 +5359,22 @@ msgstr "" #: src/xine-engine/input_rip.c:315 src/xine-engine/input_rip.c:420 #, c-format msgid "input_rip: seeking failed\n" -msgstr "" +msgstr "input_rip: la búsqueda falló\n" #: src/xine-engine/input_rip.c:372 src/xine-engine/input_rip.c:390 #, c-format msgid "input_rip: seeking failed: %s\n" -msgstr "" +msgstr "input_rip: la búsqueda falló: %s\n" #: src/xine-engine/input_rip.c:398 #, c-format msgid "input_rip: %<PRIdMAX> bytes dropped\n" -msgstr "" +msgstr "input_rip: %<PRIdMAX> bytes desechados\n" #: src/xine-engine/input_rip.c:563 #, c-format msgid "input_rip: input plugin not defined!\n" -msgstr "" +msgstr "input_rip: ¡complemento de entrada no definido!\n" #: src/xine-engine/input_rip.c:569 #, c-format @@ -5128,85 +5382,99 @@ msgid "" "input_rip: target directory wasn't specified, please fill out the option " "'media.capture.save_dir'\n" msgstr "" +"input_rip: el directorio de destino no fué especificado, por favor rellene " +"la opción 'media.capture.save_dir'\n" #: src/xine-engine/input_rip.c:571 msgid "" "The stream save feature is disabled until you set media.capture.save_dir in " "the configuration." msgstr "" +"La caracterÃstica de guardar flujo de datos está desactivada hasta que " +"defina media.capture.save_dir en la configuración." +# CER: ¿ripeado? #: src/xine-engine/input_rip.c:578 #, c-format msgid "input_rip: ripping/caching of this source is not permitted!\n" -msgstr "" +msgstr "input_rip: ¡ripeado/cacheado de esta fuente no está permitido!\n" +# CER: el "." está mal colocado, pero al final darÃa eror. #: src/xine-engine/input_rip.c:580 msgid "" "xine is not allowed to save from this source. (possibly copyrighted " "material?)" msgstr "" +"a xine no se le permite grabar desde esta fuente. (¿puede ser material con " +"copyright?)" #: src/xine-engine/input_rip.c:586 #, c-format msgid "input_rip: file name not given!\n" -msgstr "" +msgstr "input_rip: file ¡el nombre no está dado!\n" #: src/xine-engine/input_rip.c:628 #, c-format msgid "input_rip: error opening file %s: %s\n" -msgstr "" +msgstr "input_rip: error abriendo fichero %s: %s\n" #: src/xine-engine/io_helper.c:252 #, c-format msgid "io_helper: waiting abandoned\n" -msgstr "" +msgstr "io_helper: espera abandonada\n" #: src/xine-engine/io_helper.c:259 #, c-format msgid "io_helper: waiting failed: %s\n" -msgstr "" +msgstr "io_helper: falló la espera: %s\n" #: src/xine-engine/io_helper.c:314 msgid "failed to get status of socket" -msgstr "" +msgstr "falló la consecución de un socket" #: src/xine-engine/io_helper.c:388 #, c-format msgid "io_helper: Permission denied\n" -msgstr "" +msgstr "io_helper: Permiso denegado\n" #: src/xine-engine/io_helper.c:392 #, c-format msgid "io_helper: File not found\n" -msgstr "" +msgstr "io_helper: Fichero no encontrado\n" #: src/xine-engine/io_helper.c:396 #, c-format msgid "io_helper: Connection Refused\n" -msgstr "" +msgstr "io_helper: Conexión Rechazada\n" #: src/xine-engine/load_plugins.c:212 #, c-format msgid "map_decoder_list: no space for decoder, skipped.\n" -msgstr "" +msgstr "map_decoder_list: no hay espacio para el decodificador, omitido.\n" #: src/xine-engine/load_plugins.c:327 #, c-format msgid "" "load_plugins: ignoring plugin %s, wrong iface version %d (should be %d)\n" msgstr "" +"load_plugins: ignorando complemento%s, versión \"iface\" equivocada%d " +"(deberÃa ser %d)\n" #: src/xine-engine/load_plugins.c:384 #, c-format msgid "priority for %s decoder" -msgstr "" +msgstr "prioridad para decodificador %s" +# CER: ¿rank? #: src/xine-engine/load_plugins.c:395 msgid "" "The priority provides a ranking in case some media can be handled by more " "than one decoder.\n" "A priority of 0 enables the decoder's default priority." msgstr "" +"La prioridad proporciona un rango o grado en caso que algún medio pueda ser " +"manejado por más de un decodificador.\n" +"Una prioridad de 0 activa la prioridad por omisión del decodificador." #: src/xine-engine/load_plugins.c:423 #, c-format @@ -5214,6 +5482,8 @@ msgid "" "load_plugins: demuxer plugin %s does not provide a priority, xine-lib will " "use the default priority.\n" msgstr "" +"load_plugins: el complemento desmultiplexor %s no proporciona una prioridad, " +"xine-lib usará la prioridad por defecto.\n" #: src/xine-engine/load_plugins.c:440 #, c-format @@ -5221,6 +5491,8 @@ msgid "" "load_plugins: input plugin %s does not provide a priority, xine-lib will use " "the default priority.\n" msgstr "" +"load_plugins: el complemento de entrada %s no proporciona una prioridad, " +"xine-lib usará la prioridad por defecto.\n" #: src/xine-engine/load_plugins.c:496 #, c-format @@ -5236,26 +5508,31 @@ msgstr "load_plugins: encontrado complemento estático\n" #, c-format msgid "load_plugins: plugin limit reached, %s could not be loaded\n" msgstr "" +"load_plugins: alcanzado lÃmite de complementos, %s no pudo ser cargado\n" #: src/xine-engine/load_plugins.c:509 #, c-format msgid "load_plugins: plugin limit reached, static plugin could not be loaded\n" msgstr "" +"load_plugins: alcanzado lÃmite de complementos, complemento estático no " +"pudo ser cargado\n" #: src/xine-engine/load_plugins.c:526 #, c-format msgid "load_plugins: unknown plugin type %d in %s\n" -msgstr "" +msgstr "load_plugins: tipo de complemento desconocido %d en %s\n" #: src/xine-engine/load_plugins.c:530 #, c-format msgid "load_plugins: unknown statically linked plugin type %d\n" msgstr "" +"load_plugins: tipo de complemento estáticamente ligado desconocido %d\n" +# CER: ¿stat? #: src/xine-engine/load_plugins.c:590 #, c-format msgid "load_plugins: unable to stat %s\n" -msgstr "" +msgstr "load_plugins: incapaz de obtener estado %s\n" #: src/xine-engine/load_plugins.c:631 #, c-format @@ -5263,6 +5540,8 @@ msgid "" "load_plugins: cannot open plugin lib %s:\n" "%s\n" msgstr "" +"load_plugins: no puedo abrir librerÃa de complemento %s:\n" +"%s\n" #: src/xine-engine/load_plugins.c:646 #, c-format @@ -5270,11 +5549,13 @@ msgid "" "load_plugins: can't get plugin info from %s:\n" "%s\n" msgstr "" +"load_plugins: no puedo conseguir información del complemento de %s:\n" +"%s\n" #: src/xine-engine/load_plugins.c:664 #, c-format msgid "load_plugins: skipping unreadable plugin directory %s.\n" -msgstr "" +msgstr "load_plugins: omitiendo directorio de complementos ilegible %s.\n" #: src/xine-engine/load_plugins.c:713 #, c-format @@ -5282,32 +5563,36 @@ msgid "" "load_plugins: cannot (stage 2) open plugin lib %s:\n" "%s\n" msgstr "" +"load_plugins: no puedo (etapa 2) abrir librerÃa de complementos %s:\n" +"%s\n" #: src/xine-engine/load_plugins.c:739 #, c-format msgid "load_plugins: Yikes! %s doesn't contain plugin info.\n" -msgstr "" +msgstr "load_plugins: ¡Ondiá! %s no contiene información del complemento.\n" #: src/xine-engine/load_plugins.c:1305 #, c-format msgid "load_plugins: unknown content detection strategy %d\n" -msgstr "" +msgstr "load_plugins: estrategia %d de detección de contenido desconocida\n" #: src/xine-engine/load_plugins.c:1415 #, c-format msgid "load_plugins: using demuxer '%s'\n" -msgstr "" +msgstr "load_plugins: usando desmultiplexor '%s'\n" #: src/xine-engine/load_plugins.c:1711 src/xine-engine/load_plugins.c:1758 #, c-format msgid "load_plugins: failed to load audio output plugin <%s>\n" -msgstr "" +msgstr "load_plugins: fallé al cargar complemento de salida de audio <%s>\n" #: src/xine-engine/load_plugins.c:1761 msgid "" "load_plugins: audio output auto-probing didn't find any usable audio " "driver.\n" msgstr "" +"load_plugins: el auto-probado de salida de audio no encontró ningún driver " +"de audio usable audio.\n" #: src/xine-engine/load_plugins.c:2065 #, c-format @@ -5315,49 +5600,52 @@ msgid "" "load_plugins: cannot unload plugin lib %s:\n" "%s\n" msgstr "" +"load_plugins: no puedo descargar librerÃa de complementos %s:\n" +"%s\n" #: src/xine-engine/osd.c:735 #, c-format msgid "font '%s-%d' already loaded, weird.\n" -msgstr "" +msgstr "la tipografÃa '%s-%d' ya estaba cargada, raro.\n" #: src/xine-engine/osd.c:747 #, c-format msgid "font '%s' loading failed (%d < %d)\n" -msgstr "" +msgstr "la carga de la tipografÃa '%s' falló (%d < %d)\n" #: src/xine-engine/osd.c:757 #, c-format msgid "wrong version for font '%s'. expected %d found %d.\n" msgstr "" +"versión incorrecta para la tipografÃa '%s'. Se esperaba %d se encontró %d.\n" #: src/xine-engine/osd.c:824 msgid "osd: cannot initialize ft2 library\n" -msgstr "" +msgstr "osd: no puedo inicializar librerÃa ft2\n" #: src/xine-engine/osd.c:847 #, c-format msgid "osd: error matching font %s with FontConfig" -msgstr "" +msgstr "osd: error encajando tipografÃa %s con FontConfig" #: src/xine-engine/osd.c:861 #, c-format msgid "osd: error loading font %s with FontConfig" -msgstr "" +msgstr "osd: error cargando tipografÃa %s con FontConfig" #: src/xine-engine/osd.c:864 #, c-format msgid "osd: error looking up font %s with FontConfig" -msgstr "" +msgstr "osd: error buscando tipografÃa %s con FontConfig" #: src/xine-engine/osd.c:885 #, c-format msgid "osd: error loading font %s with ft2\n" -msgstr "" +msgstr "osd: error cargando tipografÃa %s con ft2\n" #: src/xine-engine/osd.c:895 msgid "osd: error setting font size (no scalable font?)\n" -msgstr "" +msgstr "osd: error poniendo tamaño de (¿tipografÃa no escalable?)\n" #: src/xine-engine/osd.c:1011 #, c-format @@ -5365,40 +5653,42 @@ msgid "" "osd: unknown sequence starting with byte 0x%02X in encoding \"%s\", " "skipping\n" msgstr "" +"osd: secuencia desconocida comenzando con byte 0x%02X en codificación \"%s" +"\", saltando\n" #: src/xine-engine/osd.c:1067 msgid "osd: can't find out current locale character set\n" -msgstr "" +msgstr "osd: no puedo encontrar juego de caracteres actual del \"locale\"\n" #: src/xine-engine/osd.c:1077 #, c-format msgid "osd: unsupported conversion %s -> %s, no conversion performed\n" -msgstr "" +msgstr "osd: conversión no soportada %s -> %s, conversión no realizada\n" #: src/xine-engine/osd.c:1132 src/xine-engine/osd.c:1300 msgid "osd: font isn't defined\n" -msgstr "" +msgstr "osd: la tipografÃa no está definida\n" #: src/xine-engine/osd.c:1171 msgid "osd: error loading glyph\n" -msgstr "" +msgstr "osd: error cargando glifo\n" #: src/xine-engine/osd.c:1177 msgid "osd: error in rendering glyph\n" -msgstr "" +msgstr "osd: error en renderizado de glifo\n" #: src/xine-engine/osd.c:1337 #, c-format msgid "osd: error loading glyph %i\n" -msgstr "" +msgstr "osd: error cargando glifo %i\n" #: src/xine-engine/osd.c:1344 msgid "osd: error in rendering\n" -msgstr "" +msgstr "osd: error en renderizado\n" #: src/xine-engine/osd.c:1601 msgid "palette (foreground-border-background) to use for subtitles and OSD" -msgstr "" +msgstr "paleta (frente-borde-fondo) a usar para subtÃtulos y VEP (OSD)" #: src/xine-engine/osd.c:1602 msgid "" @@ -5406,20 +5696,23 @@ msgid "" "specify any colouring themselves. The palettes are listed in the form: " "foreground-border-background." msgstr "" +"La paleta para la visualización en pantalla y algunos formatos de subtÃtulos " +"que no especifican ningún coloreado ellos mismos. Las paletas se listan en " +"la forma:frente-borde-fondo." #: src/xine-engine/video_decoder.c:380 #, c-format msgid "video_decoder: no plugin available to handle '%s'\n" -msgstr "" +msgstr "video_decoder: no hay complemento disponible para manejar '%s'\n" #: src/xine-engine/video_decoder.c:459 #, c-format msgid "video_decoder: error, unknown buffer type: %08x\n" -msgstr "" +msgstr "video_decoder: error, tipo de tampón desconocido: %08x\n" #: src/xine-engine/video_decoder.c:495 msgid "number of video buffers" -msgstr "" +msgstr "número de tampones de vÃdeo" #: src/xine-engine/video_decoder.c:496 msgid "" @@ -5427,11 +5720,15 @@ msgid "" "queue. Higher values mean smoother playback for unreliable inputs, but also " "increased latency and memory consumption." msgstr "" +"El número de tampones de memoria de vÃdeo (cada uno tiene 8k) que xine usa " +"en su propia cola. Valores más altos implican reproducción más suave de " +"entradas poco fiables, pero también aumentan la latencia y el consumo de " +"memoria." #: src/xine-engine/video_out.c:642 #, c-format msgid "%d frames delivered, %d frames skipped, %d frames discarded\n" -msgstr "%d marcos llegados, %d frames saltados, %d frames descartados\n" +msgstr "%d marcos entregados, %d cuadros omitidos, %d cuadros descartados\n" #: src/xine-engine/video_out.c:815 #, c-format @@ -5439,36 +5736,44 @@ msgid "" "video_out: throwing away image with pts %<PRId64> because it's too old " "(diff : %<PRId64>).\n" msgstr "" +"video_out: tirando la imagen con pts %<PRId64> porque es demasiado vieja " +"(diff : %<PRId64>).\n" #: src/xine-engine/video_out.c:1794 msgid "default number of video frames" -msgstr "" +msgstr "número por defecto de marcos de vÃdeo" #: src/xine-engine/video_out.c:1795 msgid "" "The default number of video frames to request from xine video out driver. " "Some drivers will override this setting with their own values." msgstr "" +"El número por omisión de cuadros de vÃdeo a pedir del manejador de vÃdeo de " +"salida. Algunos manejadores invalidará este ajuste con sus propios valores." #: src/xine-engine/video_out.c:1834 msgid "percentage of skipped frames to tolerate" -msgstr "" +msgstr "porcentaje de cuadros omitidos a tolerar" #: src/xine-engine/video_out.c:1835 msgid "" "When more than this percentage of frames are not shown, because they were " "not decoded in time, xine sends a notification." msgstr "" +"Cuando más de este porcentaje de cuadros no sean mostrados, porque no fueron " +"decodificados a tiempo, xine envÃa una notificación." #: src/xine-engine/video_out.c:1840 msgid "percentage of discarded frames to tolerate" -msgstr "" +msgstr "porcentaje de cuadros descartados a tolerar" #: src/xine-engine/video_out.c:1841 msgid "" "When more than this percentage of frames are not shown, because they were " "not scheduled for display in time, xine sends a notification." msgstr "" +"Cuando más de este porcentaje de cuadros no sean mostrados, porque no fueron " +"programados para su visualización a tiempo, xine envÃa una notificación." #: src/xine-engine/video_out.c:1875 msgid "video_out: sorry, this should not happen. please restart xine.\n" @@ -5477,7 +5782,7 @@ msgstr "" #: src/xine-engine/vo_scale.c:389 msgid "horizontal image position in the output window" -msgstr "" +msgstr "posición horizontal de la imagen en la ventana de salida" #: src/xine-engine/vo_scale.c:390 msgid "" @@ -5486,10 +5791,15 @@ msgid "" "The position is given as a percentage, so a value of 50 means \"in the middle" "\", while 0 means \"at the very left\" and 100 \"at the very right\"." msgstr "" +"Si el tamaño horizontal de ventana de vÃdeo es mayor que el tamaño real de " +"la imagen a mostrar, puede ajustar la posición donde se sitúe la imagen.\n" +"La posición se da como un porcentaje, de modo que un valor de 50 significa " +"\"en el centro\", mientras que 0 significa \"a la izquierda del todo\" y 100 " +"\"a la deracha del todo\"." #: src/xine-engine/vo_scale.c:397 msgid "vertical image position in the output window" -msgstr "" +msgstr "posición vertical de la imagen en la ventana de salida" #: src/xine-engine/vo_scale.c:398 msgid "" @@ -5498,10 +5808,15 @@ msgid "" "The position is given as a percentage, so a value of 50 means \"in the middle" "\", while 0 means \"at the top\" and 100 \"at the bottom\"." msgstr "" +"Si el tamaño vertical de la ventana es mayor que la imagen real a mostrar, " +"puede ajustar la posición vertical en la que se situará la imagen.\n" +"La posición se da como un porcentaje, de modo que un valor de 50 significa " +"\"en el centro\", mientras que 0 significa\"arriba a tope\" y 100 \"abajo al " +"fondo\"." #: src/xine-engine/vo_scale.c:405 msgid "disable all video scaling" -msgstr "" +msgstr "desactive todo escalado de vÃdeo" #: src/xine-engine/vo_scale.c:406 msgid "" @@ -5513,6 +5828,14 @@ msgid "" "video output drivers like XShm, where the image scaling is not hardware " "accelerated, this can dramatically reduce CPU usage." msgstr "" +"Si desea que la imagen se muestre siempre en su resolución original, puede " +"desactivar todo escalado de la imagen aquÃ.\n" +"Esto por supuesto significa que la imagen ya no se adaptará al tamaño de la " +"ventana de vÃdeo y que vÃdeos con una razón de aspecto de pÃxel distinta de " +"1:1, como DVDs anamórficos, se mostrarán distorsionados. Pero por otro lado, " +"con algunos drivers de salida de vÃdeo como XShm, donde el escalado de la " +"imagen no está acelerado en hardware, esto puede reducir drásticamente el " +"uso de cpu." #: src/xine-engine/xine.c:790 src/xine-engine/xine.c:897 #: src/xine-engine/xine.c:936 src/xine-engine/xine.c:972 @@ -5521,17 +5844,17 @@ msgstr "" #: src/xine-engine/xine.c:1049 src/xine-engine/xine.c:1074 #: src/xine-engine/xine.c:1109 msgid "xine: error while parsing mrl\n" -msgstr "" +msgstr "xine: error mientras se interpretaba mrl\n" #: src/xine-engine/xine.c:826 #, c-format msgid "xine: found input plugin : %s\n" -msgstr "" +msgstr "xine: encontrado complemento de entrada : %s\n" #: src/xine-engine/xine.c:844 #, c-format msgid "xine: input plugin cannot open MRL [%s]\n" -msgstr "" +msgstr "xine: el complemento de entrada no puede abrir el MRL [%s]\n" #: src/xine-engine/xine.c:860 #, c-format @@ -5541,56 +5864,59 @@ msgstr "xine: no se puede encontrar el complemento de entrada para MRL [%s]\n" #: src/xine-engine/xine.c:886 #, c-format msgid "xine: specified demuxer %s failed to start\n" -msgstr "xine_play: fallo al iniciar el demultiplexor %s especificado\n" +msgstr "xine: fallo al iniciar el demultiplexor %s especificado\n" +# cer: ¿join rip? #: src/xine-engine/xine.c:922 #, c-format msgid "xine: join rip input plugin\n" -msgstr "" +msgstr "xine: complemento de entrada join rip \n" #: src/xine-engine/xine.c:929 msgid "xine: error opening rip input plugin instance\n" -msgstr "" +msgstr "xine: error al abrir instancia de complemento de entrada rip\n" #: src/xine-engine/xine.c:960 #, c-format msgid "xine: last_probed demuxer %s failed to start\n" msgstr "" +"xine: el último demultiplexor probado (last_probed) %s no consiguió " +"iniciarse \n" #: src/xine-engine/xine.c:989 msgid "ignoring video\n" -msgstr "" +msgstr "ignorando vÃdeo\n" #: src/xine-engine/xine.c:1002 msgid "ignoring audio\n" -msgstr "" +msgstr "ignorando audio\n" #: src/xine-engine/xine.c:1015 msgid "ignoring subpicture\n" -msgstr "" +msgstr "ignorando subimagen\n" #: src/xine-engine/xine.c:1028 msgid "input cache plugin disabled\n" -msgstr "" +msgstr "caché del complemento de entrada desactivado\n" #: src/xine-engine/xine.c:1099 #, c-format msgid "subtitle mrl opened '%s'\n" -msgstr "" +msgstr "abierto mrl de subtÃtulos '%s'\n" #: src/xine-engine/xine.c:1103 msgid "xine: error opening subtitle mrl\n" -msgstr "" +msgstr "xine: error abriendo mrl de subtÃtulos\n" #: src/xine-engine/xine.c:1135 #, c-format msgid "xine: error while parsing MRL\n" -msgstr "" +msgstr "xine: error al interpretar MRL\n" #: src/xine-engine/xine.c:1142 #, c-format msgid "xine: changing option '%s' from MRL isn't permitted\n" -msgstr "" +msgstr "xine: cambiar la ocpión '%s' del MRL no está permitido\n" #: src/xine-engine/xine.c:1162 #, c-format @@ -5621,18 +5947,22 @@ msgstr "xine_play: fallo al iniciar el demultiplexor\n" #, c-format msgid "xine: The specified save_dir \"%s\" might be a security risk.\n" msgstr "" +"xine: El directorio (save_dir) especificado \"%s\" pudiera ser un riesgo " +"para la seguridad.\n" #: src/xine-engine/xine.c:1614 msgid "The specified save_dir might be a security risk." msgstr "" +"El directorio (save_dir) especificado pudiera ser un riesgo para la " +"seguridad." #: src/xine-engine/xine.c:1640 msgid "xine: locale not supported by C library\n" -msgstr "" +msgstr "xine: \"locale\" no soportada por la librerÃa de C\n" #: src/xine-engine/xine.c:1649 msgid "media format detection strategy" -msgstr "" +msgstr "estrategia de detecciónde formato" #: src/xine-engine/xine.c:1650 msgid "" @@ -5651,10 +5981,26 @@ msgid "" "extension\n" "Detect by file name extension only.\n" msgstr "" +"xine ofrece varios métodos para detectar el formato de medios introducidos " +"para reproducirlos. Los valores individuales son:\n" +"\n" +"default\n" +"Primero prueba a detectar por el contenido, y después por la extensión del " +"nombre del fichero.\n" +"\n" +"reverse\n" +"Primero prueba a detectar por la extensión del nombre del fichero, y después " +"por el contenido.\n" +"\n" +"content\n" +"Detectar sólo por el contenido.\n" +"\n" +"extension\n" +"Detectar sólo por la extensión del nombre del fichero.\n" #: src/xine-engine/xine.c:1668 msgid "directory for saving streams" -msgstr "" +msgstr "directorio para guardar flujos de bits" #: src/xine-engine/xine.c:1669 msgid "" @@ -5665,10 +6011,16 @@ msgid "" "you should be careful that the directory you specify is robust against any " "content in any file." msgstr "" +"Cuando se usa la función de grabar flujo, los ficheros se escribirán sólo a " +"éste directorio.\n" +"Este ajuste es crÃtico para la seguridad, porque cuando se cambia a un " +"directorio diferente, xine puede usarse para llenar ficheros con contenido " +"arbitrario. Asà que debiera ser cuidadoso que el directorio especificado sea " +"robusto contra cualquier contenido en cualquier fichero." #: src/xine-engine/xine.c:1680 msgid "allow implicit changes to the configuration (e.g. by MRL)" -msgstr "" +msgstr "permitir cambios implÃcitos a la configuración (p.e. por MRL)" #: src/xine-engine/xine.c:1681 msgid "" @@ -5679,10 +6031,17 @@ msgid "" "from untrusted remote sources. If you allow them to arbitrarily change your " "configuration, you might end with a totally messed up xine." msgstr "" +"Si se activa, usted permite a xine cabiar su configuración sin acciones " +"explÃcitas por su parte. Por ejemplo cambios de configuración demandados por " +"MRLs o embebidos en la lista de reproducción serán realizados.\n" +"Este ajuste es crÃtico para la seguridad, porque xine puede recibir MRLs o " +"listas de reproducción de sitios remotos no confiables. Si les permite " +"arbitrariamente cambiar su configuración, usted podrÃa acabar con un xine " +"totalmente enredado." #: src/xine-engine/xine.c:1695 msgid "Timeout for network stream reading (in seconds)" -msgstr "" +msgstr "Temporización para lectura de flujos de bits desde red (en segundos)" #: src/xine-engine/xine.c:1696 msgid "" @@ -5690,6 +6049,10 @@ msgid "" "values might stop streaming when the source is slow or the bandwidth is " "occupied, too high values will freeze the player if the connection is lost." msgstr "" +"Especifica la temporización cuando se leen flujos de datos desde la red, en " +"segundos. Valore demasiado bajos pueden detener la transmisión cuando la " +"fuente es lenta o el ancho de banda está ocupado; valores demasiado altos " +"congelarán el reproductor si se pierde la conexión." #: src/xine-engine/xine.c:2048 msgid "messages" @@ -5705,64 +6068,59 @@ msgstr "traza" #: src/xine-engine/xine_interface.c:958 msgid "Warning:" -msgstr "" +msgstr "Aviso:" #: src/xine-engine/xine_interface.c:959 -#, fuzzy msgid "Unknown host:" -msgstr "error desconocido" +msgstr "host desconocido:" #: src/xine-engine/xine_interface.c:960 -#, fuzzy msgid "Unknown device:" -msgstr "Tipo de evento desconocido: " +msgstr "Dispositivo desconocido:" #: src/xine-engine/xine_interface.c:961 msgid "Network unreachable" -msgstr "" +msgstr "Red no alcanzable" #: src/xine-engine/xine_interface.c:962 msgid "Connection refused:" -msgstr "" +msgstr "Conexión rechazada:" #: src/xine-engine/xine_interface.c:963 -#, fuzzy msgid "File not found:" -msgstr "input_file: Fichero no encontrado: >%s<\n" +msgstr "Fichero no encontrado:" #: src/xine-engine/xine_interface.c:964 msgid "Read error from:" -msgstr "" +msgstr "Error de lectura desde:" #: src/xine-engine/xine_interface.c:965 msgid "Error loading library:" -msgstr "" +msgstr "Error de carga de librerÃa:" #: src/xine-engine/xine_interface.c:966 -#, fuzzy msgid "Encrypted media stream detected" -msgstr "ogg: detectado stream de audio vorbis\n" +msgstr "Detectado flujo de bits de medios encriptado" #: src/xine-engine/xine_interface.c:967 msgid "Security message:" -msgstr "" +msgstr "Mensaje de seguridad:" #: src/xine-engine/xine_interface.c:968 -#, fuzzy msgid "Audio device unavailable" -msgstr "nombre del dispositivo de audio OSS" +msgstr "Dispositivo de audio no disponible" #: src/xine-engine/xine_interface.c:969 msgid "Permission error" -msgstr "" +msgstr "Error de permisos" #: src/xine-engine/xine_interface.c:970 msgid "File is empty:" -msgstr "" +msgstr "El fichero está vacÃo:" #: src/xine-utils/memcpy.c:479 msgid "memcopy method used by xine" -msgstr "" +msgstr "método \"memcopy\" usado por xine" #: src/xine-utils/memcpy.c:480 msgid "" @@ -5770,10 +6128,11 @@ msgid "" "on todays computers. Therefore xine provides various tuned methods to do " "this copying. Usually, the best method is detected automatically." msgstr "" +"El copiado de grandes bloques de memoria es una de las operaciones más " +"costosas en las computadoras actuales. Por tanto xine provee varios metodos " +"ajustados para hacer este copiado. Usualmente, el método mejor se detecta " +"automáticamente." #: src/xine-utils/memcpy.c:507 msgid "Benchmarking memcpy methods (smaller is better):\n" -msgstr "" - -#~ msgid "dvbsub: cannot create timer thread\n" -#~ msgstr "dvbsub: no puedo crear hilo temporizador\n" +msgstr "Evaluando métodos \"memcpy\" (menor es mejor):\n" diff --git a/src/audio_out/audio_alsa_out.c b/src/audio_out/audio_alsa_out.c index 3aef7978d..e92bfbb3a 100644 --- a/src/audio_out/audio_alsa_out.c +++ b/src/audio_out/audio_alsa_out.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * Credits go * - for the SPDIF A/52 sync part @@ -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_arts_out.c b/src/audio_out/audio_arts_out.c index 5347d7f76..0f0467b4a 100644 --- a/src/audio_out/audio_arts_out.c +++ b/src/audio_out/audio_arts_out.c @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: audio_arts_out.c,v 1.32 2006/07/16 16:18:09 dsalt Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ #ifdef HAVE_CONFIG_H diff --git a/src/audio_out/audio_coreaudio_out.c b/src/audio_out/audio_coreaudio_out.c index 22f53c0ef..eecab8f95 100644 --- a/src/audio_out/audio_coreaudio_out.c +++ b/src/audio_out/audio_coreaudio_out.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * done by Daniel Mack <xine@zonque.org> * modified by Rich Wareham <richwareham@users.sourceforge.net> diff --git a/src/audio_out/audio_directx2_out.c b/src/audio_out/audio_directx2_out.c index 7161f192d..d9688b647 100644 --- a/src/audio_out/audio_directx2_out.c +++ b/src/audio_out/audio_directx2_out.c @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: audio_directx2_out.c,v 1.9 2006/07/16 16:18:09 dsalt Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * * 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 d2147ac52..77e3e15b9 100644 --- a/src/audio_out/audio_directx_out.c +++ b/src/audio_out/audio_directx_out.c @@ -15,12 +15,10 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * audio_directx_out.c, direct sound audio output plugin for xine * by Matthew Grooms <elon@altavista.com> - * - * $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 20e77b75d..4b209bea1 100644 --- a/src/audio_out/audio_esd_out.c +++ b/src/audio_out/audio_esd_out.c @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: audio_esd_out.c,v 1.35 2006/07/16 16:18:09 dsalt Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ #ifdef HAVE_CONFIG_H diff --git a/src/audio_out/audio_file_out.c b/src/audio_out/audio_file_out.c index e741523b2..225d64d0e 100644 --- a/src/audio_out/audio_file_out.c +++ b/src/audio_out/audio_file_out.c @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: audio_file_out.c,v 1.8 2006/07/16 16:18:09 dsalt Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ #ifdef HAVE_CONFIG_H diff --git a/src/audio_out/audio_fusionsound_out.c b/src/audio_out/audio_fusionsound_out.c index 71a17f6e6..92eadc6cf 100644 --- a/src/audio_out/audio_fusionsound_out.c +++ b/src/audio_out/audio_fusionsound_out.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * * FusionSound based audio output plugin by Claudio Ciccani <klan@directfb.org> diff --git a/src/audio_out/audio_irixal_out.c b/src/audio_out/audio_irixal_out.c index 04c338d24..1654cc1a7 100644 --- a/src/audio_out/audio_irixal_out.c +++ b/src/audio_out/audio_irixal_out.c @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: audio_irixal_out.c,v 1.16 2006/07/16 16:18:09 dsalt Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ #ifdef HAVE_CONFIG_H diff --git a/src/audio_out/audio_none_out.c b/src/audio_out/audio_none_out.c index 0f0673431..a815d645a 100644 --- a/src/audio_out/audio_none_out.c +++ b/src/audio_out/audio_none_out.c @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: audio_none_out.c,v 1.11 2006/07/16 16:18:09 dsalt Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ #ifdef HAVE_CONFIG_H diff --git a/src/audio_out/audio_oss_out.c b/src/audio_out/audio_oss_out.c index 793b47650..a6e0fe494 100644 --- a/src/audio_out/audio_oss_out.c +++ b/src/audio_out/audio_oss_out.c @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: audio_oss_out.c,v 1.120 2007/03/17 06:59:31 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * 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 9e6089730..dfd825047 100644 --- a/src/audio_out/audio_pulse_out.c +++ b/src/audio_out/audio_pulse_out.c @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: audio_pulse_out.c,v 1.17 2007/04/01 00:32:29 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * ao plugin for pulseaudio (rename of polypaudio): * http://0pointer.de/lennart/projects/pulsaudio/ @@ -25,7 +23,6 @@ * 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 5923eb658..b23955b77 100644 --- a/src/audio_out/audio_sun_out.c +++ b/src/audio_out/audio_sun_out.c @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: audio_sun_out.c,v 1.47 2007/03/10 00:55:14 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ #ifdef HAVE_CONFIG_H diff --git a/src/combined/combined_wavpack.c b/src/combined/combined_wavpack.c index 7a334b15c..893ee99be 100644 --- a/src/combined/combined_wavpack.c +++ b/src/combined/combined_wavpack.c @@ -15,11 +15,9 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * xine interface to libwavpack by Diego Pettenò <flameeyes@gmail.com> - * - * $Id: combined_wavpack.c,v 1.3 2007/03/17 07:34:02 dgp85 Exp $ */ #include "xine_internal.h" diff --git a/src/combined/combined_wavpack.h b/src/combined/combined_wavpack.h index b7bf32acb..61a504a4f 100644 --- a/src/combined/combined_wavpack.h +++ b/src/combined/combined_wavpack.h @@ -15,11 +15,9 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * xine interface to libwavpack by Diego Pettenò <flameeyes@gmail.com> - * - * $Id: combined_wavpack.h,v 1.3 2007/03/17 07:34:02 dgp85 Exp $ */ #include "os_types.h" diff --git a/src/combined/decoder_flac.c b/src/combined/decoder_flac.c index 148f5e62c..2230056cd 100644 --- a/src/combined/decoder_flac.c +++ b/src/combined/decoder_flac.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * John McCutchan 2003 * FLAC Decoder (http://flac.sf.net) diff --git a/src/combined/decoder_wavpack.c b/src/combined/decoder_wavpack.c index e036e3bf8..f8a301c9f 100644 --- a/src/combined/decoder_wavpack.c +++ b/src/combined/decoder_wavpack.c @@ -15,11 +15,9 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * xine interface to libwavpack by Diego Pettenò <flameeyes@gmail.com> - * - * $Id: decoder_wavpack.c,v 1.14 2007/03/29 19:45:33 dgp85 Exp $ */ #ifdef HAVE_CONFIG_H diff --git a/src/combined/demux_flac.c b/src/combined/demux_flac.c index 43ee17d5c..85f98e876 100644 --- a/src/combined/demux_flac.c +++ b/src/combined/demux_flac.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * * John McCutchan diff --git a/src/combined/demux_flac.h b/src/combined/demux_flac.h index 6086781d1..a48c73260 100644 --- a/src/combined/demux_flac.h +++ b/src/combined/demux_flac.h @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: demux_flac.h,v 1.2 2003/12/09 00:02:32 f1rmb Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ #ifndef HAVE_DEMUX_FLAC_H diff --git a/src/combined/demux_wavpack.c b/src/combined/demux_wavpack.c index 7343976fa..e8081bca9 100644 --- a/src/combined/demux_wavpack.c +++ b/src/combined/demux_wavpack.c @@ -15,11 +15,9 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * xine interface to libwavpack by Diego Pettenò <flameeyes@gmail.com> - * - * $Id: demux_wavpack.c,v 1.11 2007/03/17 07:34:02 dgp85 Exp $ */ #ifdef HAVE_CONFIG_H diff --git a/src/demuxers/asfheader.h b/src/demuxers/asfheader.h index d52b1c0fb..4bd13ab3f 100644 --- a/src/demuxers/asfheader.h +++ b/src/demuxers/asfheader.h @@ -15,9 +15,7 @@ *
* You should have received a copy of the GNU General Public 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: asfheader.h,v 1.8 2006/09/12 21:24:19 valtri Exp $
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
*
* demultiplexer for asf streams
*
diff --git a/src/demuxers/demux.h b/src/demuxers/demux.h index 157519a87..81907cfcf 100644 --- a/src/demuxers/demux.h +++ b/src/demuxers/demux.h @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: demux.h,v 1.40 2007/01/19 00:26:39 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ #ifndef HAVE_DEMUX_H diff --git a/src/demuxers/demux_4xm.c b/src/demuxers/demux_4xm.c index 6d599adac..24aee1ac4 100644 --- a/src/demuxers/demux_4xm.c +++ b/src/demuxers/demux_4xm.c @@ -15,15 +15,13 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ /* * 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 1a89cb328..d80413f83 100644 --- a/src/demuxers/demux_aac.c +++ b/src/demuxers/demux_aac.c @@ -15,13 +15,11 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * Raw AAC File Demuxer by Mike Melanson (melanson@pcisys.net) * This demuxer detects ADIF and ADTS headers in AAC files. * 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 ce33ab3c8..c0fae275b 100644 --- a/src/demuxers/demux_ac3.c +++ b/src/demuxers/demux_ac3.c @@ -15,15 +15,13 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ /* * 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 2039a3958..7fcaea70e 100644 --- a/src/demuxers/demux_aiff.c +++ b/src/demuxers/demux_aiff.c @@ -15,14 +15,11 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ /* * 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 62e245666..579e0af07 100644 --- a/src/demuxers/demux_asf.c +++ b/src/demuxers/demux_asf.c @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: demux_asf.c,v 1.194 2007/03/09 23:18:19 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * demultiplexer for asf streams * diff --git a/src/demuxers/demux_aud.c b/src/demuxers/demux_aud.c index 8604ea317..a6f88ff48 100644 --- a/src/demuxers/demux_aud.c +++ b/src/demuxers/demux_aud.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ /* @@ -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 960d396f3..544c19d76 100644 --- a/src/demuxers/demux_avi.c +++ b/src/demuxers/demux_avi.c @@ -15,12 +15,10 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ /* - * $Id: demux_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 d92a8ba23..0f34a7cec 100644 --- a/src/demuxers/demux_cdda.c +++ b/src/demuxers/demux_cdda.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ /* @@ -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 0fe758e70..7c9b47fcd 100644 --- a/src/demuxers/demux_dts.c +++ b/src/demuxers/demux_dts.c @@ -15,11 +15,9 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * Raw DTS Demuxer by James Stembridge (jstembridge@gmail.com) - * - * $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 c1718d803..2359d3baf 100644 --- a/src/demuxers/demux_eawve.c +++ b/src/demuxers/demux_eawve.c @@ -15,12 +15,10 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ /* - * $Id: demux_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 be86b32ed..d0a821504 100644 --- a/src/demuxers/demux_elem.c +++ b/src/demuxers/demux_elem.c @@ -15,12 +15,10 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ /* - * $Id: demux_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 3a88ddfab..13036afc1 100644 --- a/src/demuxers/demux_film.c +++ b/src/demuxers/demux_film.c @@ -15,13 +15,11 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * FILM (CPK) File Demuxer by Mike Melanson (melanson@pcisys.net) * For more information on the FILM file format, visit: * 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 c1dedb6ce..3afb5b031 100644 --- a/src/demuxers/demux_flac.c +++ b/src/demuxers/demux_flac.c @@ -15,15 +15,13 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ /* * 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 921f08294..99843a68c 100644 --- a/src/demuxers/demux_fli.c +++ b/src/demuxers/demux_fli.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ /* @@ -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 e607745ed..9ccfe7e7f 100644 --- a/src/demuxers/demux_flv.c +++ b/src/demuxers/demux_flv.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ /* @@ -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 f14e36185..99754c797 100644 --- a/src/demuxers/demux_idcin.c +++ b/src/demuxers/demux_idcin.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ /* @@ -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 7323c061d..d914405db 100644 --- a/src/demuxers/demux_iff.c +++ b/src/demuxers/demux_iff.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ /* @@ -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 629299281..9f53e4173 100644 --- a/src/demuxers/demux_image.c +++ b/src/demuxers/demux_image.c @@ -15,12 +15,10 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ /* - * $Id: demux_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 26392c73b..cd21896c0 100644 --- a/src/demuxers/demux_ipmovie.c +++ b/src/demuxers/demux_ipmovie.c @@ -15,15 +15,13 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ /* * 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 b45db701e..0169651a0 100644 --- a/src/demuxers/demux_matroska.c +++ b/src/demuxers/demux_matroska.c @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: demux_matroska.c,v 1.53 2007/03/12 16:27:21 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * demultiplexer for matroska streams * @@ -25,7 +23,6 @@ * 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 e2ab1e4ea..12da8ca86 100644 --- a/src/demuxers/demux_mng.c +++ b/src/demuxers/demux_mng.c @@ -15,12 +15,10 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ /* - * $Id: demux_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_mod.c b/src/demuxers/demux_mod.c index f1b3cdd37..e7c6f86b3 100644 --- a/src/demuxers/demux_mod.c +++ b/src/demuxers/demux_mod.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ /* diff --git a/src/demuxers/demux_mpc.c b/src/demuxers/demux_mpc.c index 86eb7bf3a..346f0c2e6 100644 --- a/src/demuxers/demux_mpc.c +++ b/src/demuxers/demux_mpc.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * Musepack demuxer by James Stembridge <jstembridge@gmail.com> * @@ -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 145721ce3..4419f8404 100644 --- a/src/demuxers/demux_mpeg.c +++ b/src/demuxers/demux_mpeg.c @@ -15,12 +15,10 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ /* - * $Id: demux_mpeg.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 7083d33d9..32638129d 100644 --- a/src/demuxers/demux_mpeg_block.c +++ b/src/demuxers/demux_mpeg_block.c @@ -15,13 +15,10 @@ * * You should have received a copy of the GNU General Public 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: demux_mpeg_block.c,v 1.220 2007/02/20 00:34:55 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * 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 9ef38f97d..423da5e24 100644 --- a/src/demuxers/demux_mpeg_pes.c +++ b/src/demuxers/demux_mpeg_pes.c @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: demux_mpeg_pes.c,v 1.43 2007/03/29 17:11:36 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * demultiplexer for mpeg 2 PES (Packetized Elementary Streams) * reads streams of variable blocksizes @@ -25,7 +23,6 @@ * 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 @@ -136,13 +133,79 @@ static int32_t parse_IEC14496_FlexMux_stream(demux_mpeg_pes_t *this, uint8_t *p, static int32_t parse_program_stream_directory(demux_mpeg_pes_t *this, uint8_t *p, buf_element_t *buf); static int32_t parse_program_stream_pack_header(demux_mpeg_pes_t *this, uint8_t *p, buf_element_t *buf); -static void check_newpts( demux_mpeg_pes_t *this, int64_t pts, int video ) +static int detect_pts_discontinuity( demux_mpeg_pes_t *this, int64_t pts, int video ) { int64_t diff; - + + /* discontinuity detection is difficult to implement in the demuxer as it gets + * for example video packets in decoding order and there can be multiple audio + * and video tracks. So for simplicity, let's just deal with a single audio and + * a single video track. + * + * To start with, let's have a look at the audio and video track independently. + * Whenever pts differs from last_pts[video] by at least WRAP_THRESHOLD, a jump + * in pts is detected. Such a jump can happen for example when the pts counter + * overflows, as shown below (video decoding order ignored for simplicity; the + * variable values are shown after returning from the below function check_newpts; + * an asterisk means that this value has been cleared (see check_newpts)): + * + * pts: 7v 7a 8v 9v 9a : 0v 1v 1a 2v 3v 3a 4v + * last_pts[0]: 6 7 7 7 9 : * * 1 1 1 3 3 + * last_pts[1]: 7 7 8 9 9 : 0 1 1 2 3 3 4 + * | | | + * | | +--- audio pts wrap ignored + * | +--------- video pts wrap detected + * +----------- pts wrap boundary + */ diff = pts - this->last_pts[video]; - - if( pts && (this->send_newpts || (this->last_pts[video] && abs(diff)>WRAP_THRESHOLD) ) ) { + + if (this->last_pts[video] && abs(diff)>WRAP_THRESHOLD) + return 1; + + /* but the above code can cause a huge delay while replaying when audio and video + * track are not aligned on a common pts wrap boundery, as shown below: + * + * pts: 7v 8v 7a 9v : 0v 9a 1v 2v : 1a 3v 4v 3a + * last_pts[0]: 6 6 7 7 : * 9 9 9 : 1 1 1 3 + * last_pts[1]: 7 8 8 9 : 0 0 1 2 : * 3 4 4 + * | | | | | + * | | | | +--- audio pts wrap detected + * | | | +----- audio pts wrap boundary + * | | +-------------- audio packet causes a huge delay + * | +----------------- video pts wrap detected + * +------------------- video pts wrap boundery + * + * So there is the need to compare audio track pts against video track pts + * to detect when pts values are in between pts wrap bounderies, where a + * jump needs to be detected too, as shown below: + * + * pts: 7v 8v 7a 9v : 0v 9a 1v 2v : 1a 3v 4v 3a + * last_pts[0]: 6 6 7 7 : * 9 * * : 1 1 1 3 + * last_pts[1]: 7 8 8 9 : 0 * 1 2 : 2 3 4 4 + * | | | | | | + * | | | | | +--- (audio pts wrap ignored) + * | | | | +----- audio pts wrap boundary + * | | | +----------- video pts wrap detected + * | | +-------------- audio pts wrap detected + * | +----------------- video pts wrap detected + * +------------------- (video pts wrap boundery) + * + * Basically, it's almost the same test like above, but against the other track's + * pts value and with a different limit. As the pts counter is a 33 bit unsigned + * integer, we choose 2^31 as limit (2^32 would require the tracks to be aligned). + */ + diff = pts - this->last_pts[1-video]; + + if (this->last_pts[1-video] && abs(diff)>(1u<<31)) + return 1; + + /* no discontinuity detected */ + return 0; +} + +static void check_newpts( demux_mpeg_pes_t *this, int64_t pts, int video ) +{ + if( pts && (this->send_newpts || detect_pts_discontinuity(this, pts, video) ) ) { /* check if pts is outside nav pts range. any stream without nav must enter here. */ if( pts > this->nav_last_end_pts || pts < this->nav_last_start_pts ) @@ -159,47 +222,13 @@ static void check_newpts( demux_mpeg_pes_t *this, int64_t pts, int video ) } else { lprintf("no wrap detected\n" ); } - + + /* clear pts on the other track to avoid detecting the same discontinuity again */ this->last_pts[1-video] = 0; } if( pts ) - { - /* don't detect a discontinuity only for video respectively audio. It's also a discontinuity - indication when audio and video pts differ to much e. g. when a pts wrap happens. - The original code worked well when the wrap happend like this: - - V7 A7 V8 V9 A9 Dv V0 V1 da A1 V2 V3 A3 V4 - - Legend: - Vn = video packet with timestamp n - An = audio packet with timestamp n - Dv = discontinuity detected on following video packet - Da = discontinuity detected on following audio packet - dv = discontinuity detected on following video packet but ignored - da = discontinuity detected on following audio packet but ignored - - But with a certain delay between audio and video packets (e. g. the way DVB-S broadcasts - the packets) the code didn't work: - - V7 V8 A7 V9 Dv V0 _A9_ V1 V2 Da _A1_ V3 V4 A3 - - Packet A9 caused audio to jump forward and A1 caused it to jump backward with inserting - a delay of almoust 26.5 hours! - - The new code gives the following sequences for the above examples: - - V7 A7 V8 V9 A9 Dv V0 V1 A1 V2 V3 A3 V4 - - V7 V8 A7 V9 Dv V0 Da A9 Dv V1 V2 A1 V3 V4 A3 - - After proving this code it should be cleaned up to use just a single variable "last_pts". */ - -/* this->last_pts[video] = pts; -*/ - this->last_pts[video] = this->last_pts[1-video] = pts; - } } static off_t read_data(demux_mpeg_pes_t *this, uint8_t *buf, off_t nlen) diff --git a/src/demuxers/demux_mpgaudio.c b/src/demuxers/demux_mpgaudio.c index 78b81a1d4..73e43c199 100644 --- a/src/demuxers/demux_mpgaudio.c +++ b/src/demuxers/demux_mpgaudio.c @@ -15,15 +15,12 @@ * * You should have received a copy of the GNU General Public 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: demux_mpgaudio.c,v 1.156 2007/03/29 16:32:12 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * 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_nsf.c b/src/demuxers/demux_nsf.c index 7408274d5..81f42044f 100644 --- a/src/demuxers/demux_nsf.c +++ b/src/demuxers/demux_nsf.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ /* @@ -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/demuxers/demux_nsv.c b/src/demuxers/demux_nsv.c index 4f730a935..44bb18c79 100644 --- a/src/demuxers/demux_nsv.c +++ b/src/demuxers/demux_nsv.c @@ -15,15 +15,13 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ /* * 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_ogg.c b/src/demuxers/demux_ogg.c index a23bfa6b6..eb4f7ba5a 100644 --- a/src/demuxers/demux_ogg.c +++ b/src/demuxers/demux_ogg.c @@ -15,14 +15,11 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ /* - * $Id: demux_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/demuxers/demux_pva.c b/src/demuxers/demux_pva.c index 1b358eb1f..298d936b5 100644 --- a/src/demuxers/demux_pva.c +++ b/src/demuxers/demux_pva.c @@ -15,15 +15,13 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ /* * 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 1e0bdebab..b9fadc804 100644 --- a/src/demuxers/demux_qt.c +++ b/src/demuxers/demux_qt.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * Quicktime File Demuxer by Mike Melanson (melanson@pcisys.net) * based on a Quicktime parsing experiment entitled 'lazyqt' @@ -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 7a4cbaec9..2d21f080d 100644 --- a/src/demuxers/demux_rawdv.c +++ b/src/demuxers/demux_rawdv.c @@ -15,12 +15,10 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ /* - * $Id: demux_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 b58366e91..11c5069eb 100644 --- a/src/demuxers/demux_real.c +++ b/src/demuxers/demux_real.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ /* @@ -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 139ad24f4..70c9b310a 100644 --- a/src/demuxers/demux_realaudio.c +++ b/src/demuxers/demux_realaudio.c @@ -15,14 +15,12 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ /* * 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 10137be7f..18edaea87 100644 --- a/src/demuxers/demux_roq.c +++ b/src/demuxers/demux_roq.c @@ -15,15 +15,13 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ /* * 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 3db568aab..87324ab45 100644 --- a/src/demuxers/demux_shn.c +++ b/src/demuxers/demux_shn.c @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: demux_shn.c,v 1.4 2007/01/19 00:26:40 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ #ifdef HAVE_CONFIG_H diff --git a/src/demuxers/demux_slave.c b/src/demuxers/demux_slave.c index a00ad0661..436d37579 100644 --- a/src/demuxers/demux_slave.c +++ b/src/demuxers/demux_slave.c @@ -17,12 +17,10 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ /* - * $Id: demux_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 8601d3cbc..899fbf7e3 100644 --- a/src/demuxers/demux_smjpeg.c +++ b/src/demuxers/demux_smjpeg.c @@ -15,15 +15,13 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ /* * 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 0f28d81cf..0965a75ae 100644 --- a/src/demuxers/demux_snd.c +++ b/src/demuxers/demux_snd.c @@ -15,13 +15,11 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ /* * 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 6f3556dd4..2cf542014 100644 --- a/src/demuxers/demux_str.c +++ b/src/demuxers/demux_str.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ /* @@ -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 0d82c7bae..3ed6bcecd 100644 --- a/src/demuxers/demux_ts.c +++ b/src/demuxers/demux_ts.c @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: demux_ts.c,v 1.129 2007/04/02 10:46:08 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * Demultiplexer for MPEG2 Transport Streams. * diff --git a/src/demuxers/demux_tta.c b/src/demuxers/demux_tta.c index ab0936d88..f6eadd652 100644 --- a/src/demuxers/demux_tta.c +++ b/src/demuxers/demux_tta.c @@ -15,12 +15,10 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * True Audio demuxer by Diego Pettenò <flameeyes@gentoo.org> * Inspired by tta libavformat demuxer by Alex Beregszaszi - * - * $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 fd6900ec0..8b0087417 100644 --- a/src/demuxers/demux_vmd.c +++ b/src/demuxers/demux_vmd.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ /* @@ -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 bb0cfc16d..0439980f8 100644 --- a/src/demuxers/demux_voc.c +++ b/src/demuxers/demux_voc.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ /* @@ -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 c772e4978..3ce2ad705 100644 --- a/src/demuxers/demux_vox.c +++ b/src/demuxers/demux_vox.c @@ -15,15 +15,12 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ /* * 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 987114793..40242476b 100644 --- a/src/demuxers/demux_vqa.c +++ b/src/demuxers/demux_vqa.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ /* @@ -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 d7f8f9f9c..9b46336fe 100644 --- a/src/demuxers/demux_wav.c +++ b/src/demuxers/demux_wav.c @@ -15,14 +15,12 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ /* * 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 7ab10c0aa..596d47f4a 100644 --- a/src/demuxers/demux_wc3movie.c +++ b/src/demuxers/demux_wc3movie.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ /* @@ -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 4e0bb1069..9c5856710 100644 --- a/src/demuxers/demux_yuv4mpeg2.c +++ b/src/demuxers/demux_yuv4mpeg2.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ /* @@ -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 3866f0437..774329c05 100644 --- a/src/demuxers/demux_yuv_frames.c +++ b/src/demuxers/demux_yuv_frames.c @@ -16,12 +16,10 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ /* - * $Id: demux_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 487344316..ac44aecd7 100644 --- a/src/demuxers/ebml.c +++ b/src/demuxers/ebml.c @@ -15,13 +15,10 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * EBML parser * a lot of ideas from the gstreamer parser - * - * $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 9b3af4efe..35078c502 100644 --- a/src/demuxers/ebml.h +++ b/src/demuxers/ebml.h @@ -15,13 +15,10 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * EBML parser * a lot of ideas from the gstreamer parser - * - * $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/flacutils.h b/src/demuxers/flacutils.h index c95f87519..e69639925 100644 --- a/src/demuxers/flacutils.h +++ b/src/demuxers/flacutils.h @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ #ifndef __FLACUTILS_H__ diff --git a/src/demuxers/group_audio.c b/src/demuxers/group_audio.c index a498a3799..bd3932b36 100644 --- a/src/demuxers/group_audio.c +++ b/src/demuxers/group_audio.c @@ -15,11 +15,9 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * This file contains plugin entries for several demuxers used in games - * - * $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 7f1fccc5e..6b74d9feb 100644 --- a/src/demuxers/group_audio.h +++ b/src/demuxers/group_audio.h @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: group_audio.h,v 1.9 2006/12/26 16:59:55 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ #ifndef HAVE_GROUP_AUDIO_H diff --git a/src/demuxers/group_games.c b/src/demuxers/group_games.c index 52e39db85..ad257c2fb 100644 --- a/src/demuxers/group_games.c +++ b/src/demuxers/group_games.c @@ -15,11 +15,9 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * This file contains plugin entries for several demuxers used in games - * - * $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 a2e8ef254..f93d4bb07 100644 --- a/src/demuxers/group_games.h +++ b/src/demuxers/group_games.h @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: group_games.h,v 1.3 2004/02/13 13:48:03 tmmm Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ #ifndef HAVE_GROUP_GAMES_H diff --git a/src/demuxers/id3.c b/src/demuxers/id3.c index bc7902168..1613e3a19 100644 --- a/src/demuxers/id3.c +++ b/src/demuxers/id3.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * ID3 tag parser * @@ -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 a5ab0bd1d..b4ea4b6be 100644 --- a/src/demuxers/id3.h +++ b/src/demuxers/id3.h @@ -15,13 +15,11 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * ID3 tag parser * * 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 64f44fd94..94830f69c 100644 --- a/src/demuxers/iff.h +++ b/src/demuxers/iff.h @@ -15,14 +15,12 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ /* * 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 6950a0079..6806c207d 100644 --- a/src/demuxers/matroska.h +++ b/src/demuxers/matroska.h @@ -15,10 +15,7 @@ * * You should have received a copy of the GNU General Public 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: matroska.h,v 1.11 2007/01/07 12:33:50 molivier Exp $ - * + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ #ifndef MATROSKA_H #define MATROSKA_H diff --git a/src/dxr3/dxr3.h b/src/dxr3/dxr3.h index 59bb439d2..f08ddcd04 100644 --- a/src/dxr3/dxr3.h +++ b/src/dxr3/dxr3.h @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: dxr3.h,v 1.8 2004/04/10 15:29:57 mroi Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ #ifndef HAVE_DXR3_H diff --git a/src/dxr3/dxr3_decode_spu.c b/src/dxr3/dxr3_decode_spu.c index f8fb5264d..139939d8e 100644 --- a/src/dxr3/dxr3_decode_spu.c +++ b/src/dxr3/dxr3_decode_spu.c @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: dxr3_decode_spu.c,v 1.56 2006/07/10 22:08:13 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ /* dxr3 spu decoder plugin. diff --git a/src/dxr3/dxr3_decode_video.c b/src/dxr3/dxr3_decode_video.c index 675a3847a..3f1c273ff 100644 --- a/src/dxr3/dxr3_decode_video.c +++ b/src/dxr3/dxr3_decode_video.c @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: dxr3_decode_video.c,v 1.64 2006/07/10 22:08:13 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ /* dxr3 video decoder plugin. diff --git a/src/dxr3/dxr3_mpeg_encoders.c b/src/dxr3/dxr3_mpeg_encoders.c index cba47aad4..0c59b0b93 100644 --- a/src/dxr3/dxr3_mpeg_encoders.c +++ b/src/dxr3/dxr3_mpeg_encoders.c @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: dxr3_mpeg_encoders.c,v 1.25 2007/03/10 17:25:13 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ /* mpeg encoders for the dxr3 video out plugin. diff --git a/src/dxr3/dxr3_scr.c b/src/dxr3/dxr3_scr.c index 8d4c3b5cc..8fb049656 100644 --- a/src/dxr3/dxr3_scr.c +++ b/src/dxr3/dxr3_scr.c @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: dxr3_scr.c,v 1.19 2004/08/16 15:52:24 mroi Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ /* dxr3 scr plugin. diff --git a/src/dxr3/dxr3_scr.h b/src/dxr3/dxr3_scr.h index fe4f1ccbe..d0e155c27 100644 --- a/src/dxr3/dxr3_scr.h +++ b/src/dxr3/dxr3_scr.h @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: dxr3_scr.h,v 1.7 2004/01/04 22:26:29 mroi Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ #include "xine_internal.h" diff --git a/src/dxr3/dxr3_spu_encoder.c b/src/dxr3/dxr3_spu_encoder.c index 75ad12495..1dcc13b77 100644 --- a/src/dxr3/dxr3_spu_encoder.c +++ b/src/dxr3/dxr3_spu_encoder.c @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: dxr3_spu_encoder.c,v 1.9 2005/09/24 19:08:26 miguelfreitas Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ #include <stdio.h> diff --git a/src/dxr3/video_out_dxr3.c b/src/dxr3/video_out_dxr3.c index 71f66030a..73eb133e1 100644 --- a/src/dxr3/video_out_dxr3.c +++ b/src/dxr3/video_out_dxr3.c @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: video_out_dxr3.c,v 1.117 2006/07/17 17:19:51 dsalt Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ /* 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 8a5e9a8e6..0297204dd 100644 --- a/src/dxr3/video_out_dxr3.h +++ b/src/dxr3/video_out_dxr3.h @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: video_out_dxr3.h,v 1.25 2005/09/25 00:44:04 miguelfreitas Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ #ifdef HAVE_CONFIG_H diff --git a/src/input/base64.c b/src/input/base64.c index 0eccbe84e..ffb039802 100644 --- a/src/input/base64.c +++ b/src/input/base64.c @@ -15,11 +15,10 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * Base64 encoding modified for Musicbrainz * relicensed under the GNU General Public License for use in xine-lib - * */ /* -------------------------------------------------------------------------- @@ -39,9 +38,7 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - $Id: base64.c,v 1.2 2004/05/05 18:44:19 mroi Exp $ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA ----------------------------------------------------------------------------*/ /* @@ -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 72feef885..5cc94d7f0 100644 --- a/src/input/base64.h +++ b/src/input/base64.h @@ -15,11 +15,10 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * Base64 encoding modified for Musicbrainz * relicensed under the GNU General Public License for use in xine-lib - * */ /* -------------------------------------------------------------------------- @@ -39,9 +38,7 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - $Id: base64.h,v 1.1 2004/05/05 09:11:39 hadess Exp $ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA ----------------------------------------------------------------------------*/ /* @@ -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 4bcb734e2..4883763b0 100644 --- a/src/input/http_helper.c +++ b/src/input/http_helper.c @@ -15,11 +15,9 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * URL helper functions - * - * $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 546a55803..3ce3f2b7c 100644 --- a/src/input/http_helper.h +++ b/src/input/http_helper.h @@ -15,11 +15,9 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * URL helper functions - * - * $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 0b1f046e8..35650c858 100644 --- a/src/input/input_cdda.c +++ b/src/input/input_cdda.c @@ -15,12 +15,10 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * Compact Disc Digital Audio (CDDA) Input Plugin * by Mike Melanson (melanson@pcisys.net) - * - * $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 b3a399ce4..da3ef73eb 100644 --- a/src/input/input_dvb.c +++ b/src/input/input_dvb.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * * Input plugin for Digital TV (Digital Video Broadcast - DVB) devices, diff --git a/src/input/input_dvd.c b/src/input/input_dvd.c index 0cc4deda9..a891b9877 100644 --- a/src/input/input_dvd.c +++ b/src/input/input_dvd.c @@ -16,10 +16,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - * - * $Id: input_dvd.c,v 1.216 2007/02/20 01:04:07 dgp85 Exp $ - * + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ /* 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 c0ff41a78..abb689e39 100644 --- a/src/input/input_file.c +++ b/src/input/input_file.c @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: input_file.c,v 1.122 2007/03/29 19:47:17 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ #ifdef HAVE_CONFIG_H diff --git a/src/input/input_gnome_vfs.c b/src/input/input_gnome_vfs.c index 540abd0f4..ba42a02d4 100644 --- a/src/input/input_gnome_vfs.c +++ b/src/input/input_gnome_vfs.c @@ -16,9 +16,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - * - * $Id: input_gnome_vfs.c,v 1.34 2007/01/19 01:05:25 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ diff --git a/src/input/input_http.c b/src/input/input_http.c index 934e6a9f6..af696ca14 100644 --- a/src/input/input_http.c +++ b/src/input/input_http.c @@ -15,11 +15,9 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * input plugin for http network streams - * - * $Id: input_http.c,v 1.129 2007/03/17 16:47:16 dgp85 Exp $ */ #ifdef HAVE_CONFIG_H @@ -64,7 +62,7 @@ #define TAG_ICY_NOTICE2 "icy-notice2:" #define TAG_ICY_METAINT "icy-metaint:" #define TAG_CONTENT_TYPE "Content-Type:" -#define TAG_LASTFM_SERVER "Server: last.fm Streaming Server" +#define TAG_LASTFM_SERVER "Server: last.fm " typedef struct { input_plugin_t input_plugin; diff --git a/src/input/input_mms.c b/src/input/input_mms.c index 05c0b168b..6a1e729e6 100644 --- a/src/input/input_mms.c +++ b/src/input/input_mms.c @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: input_mms.c,v 1.70 2007/02/20 00:51:39 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * mms input plugin based on work from major mms */ diff --git a/src/input/input_net.c b/src/input/input_net.c index 0ce2e1340..4dfa63eda 100644 --- a/src/input/input_net.c +++ b/src/input/input_net.c @@ -15,13 +15,11 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * Read from a tcp network stream over a lan (put a tweaked mp1e encoder the * other end and you can watch tv anywhere in the house ..) * - * $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 11e1303e7..1d1e5cf53 100644 --- a/src/input/input_plugin.h +++ b/src/input/input_plugin.h @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: input_plugin.h,v 1.64 2007/01/19 01:05:25 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ #ifndef HAVE_INPUT_PLUGIN_H diff --git a/src/input/input_pnm.c b/src/input/input_pnm.c index e1413b0f7..680c5b1e8 100644 --- a/src/input/input_pnm.c +++ b/src/input/input_pnm.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * pnm input plugin by joschka */ diff --git a/src/input/input_pvr.c b/src/input/input_pvr.c index bcf93af2b..b8baffdbe 100644 --- a/src/input/input_pvr.c +++ b/src/input/input_pvr.c @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * pvr input plugin for WinTV-PVR 250/350 pci cards using driver from: * http://ivtv.sf.net @@ -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_rtp.c b/src/input/input_rtp.c index 681bced0f..25498f289 100644 --- a/src/input/input_rtp.c +++ b/src/input/input_rtp.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * Xine input plugin for multicast video streams. * diff --git a/src/input/input_rtsp.c b/src/input/input_rtsp.c index 693e8af66..2895edf5d 100644 --- a/src/input/input_rtsp.c +++ b/src/input/input_rtsp.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * rtsp input plugin */ diff --git a/src/input/input_smb.c b/src/input/input_smb.c index 1b1f15565..7da9c1454 100644 --- a/src/input/input_smb.c +++ b/src/input/input_smb.c @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: input_smb.c,v 1.16 2007/01/26 17:06:05 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ diff --git a/src/input/input_stdin_fifo.c b/src/input/input_stdin_fifo.c index 939f56f25..465e9c00b 100644 --- a/src/input/input_stdin_fifo.c +++ b/src/input/input_stdin_fifo.c @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: input_stdin_fifo.c,v 1.70 2007/02/20 00:34:56 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ #ifdef HAVE_CONFIG_H diff --git a/src/input/input_v4l.c b/src/input/input_v4l.c index 6829470ff..2316ef9ba 100644 --- a/src/input/input_v4l.c +++ b/src/input/input_v4l.c @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * v4l input plugin */ diff --git a/src/input/input_vcd.c b/src/input/input_vcd.c index bcd50ecc1..31ba90436 100644 --- a/src/input/input_vcd.c +++ b/src/input/input_vcd.c @@ -15,10 +15,7 @@ * * You should have received a copy of the GNU General Public 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: input_vcd.c,v 1.89 2007/03/16 16:32:58 dgp85 Exp $ - * + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ #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 8afc19df6..f7206b583 100644 --- a/src/input/libreal/asmrp.c +++ b/src/input/libreal/asmrp.c @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: asmrp.c,v 1.10 2006/12/25 15:39:31 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * a parser for real's asm rules * diff --git a/src/input/libreal/asmrp.h b/src/input/libreal/asmrp.h index d787eb330..dcc373bd0 100644 --- a/src/input/libreal/asmrp.h +++ b/src/input/libreal/asmrp.h @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: asmrp.h,v 1.3 2006/11/29 19:43:01 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * a parser for real's asm rules * diff --git a/src/input/libreal/real.c b/src/input/libreal/real.c index 07805729f..df50f0440 100644 --- a/src/input/libreal/real.c +++ b/src/input/libreal/real.c @@ -15,13 +15,10 @@ * * You should have received a copy of the GNU General Public 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: real.c,v 1.26 2007/01/19 01:19:06 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * 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 ef9778dbc..edcd170f8 100644 --- a/src/input/libreal/real.h +++ b/src/input/libreal/real.h @@ -15,13 +15,10 @@ * * You should have received a copy of the GNU General Public 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: real.h,v 1.5 2004/04/24 16:55:42 miguelfreitas Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * 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 2fec05972..159b81ee6 100644 --- a/src/input/libreal/rmff.c +++ b/src/input/libreal/rmff.c @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: rmff.c,v 1.8 2006/06/20 01:07:58 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * 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 4f33d93a5..d39942088 100644 --- a/src/input/libreal/rmff.h +++ b/src/input/libreal/rmff.h @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: rmff.h,v 1.5 2004/04/06 19:20:16 valtri Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * 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 019237243..c62b6bbc1 100644 --- a/src/input/libreal/sdpplin.c +++ b/src/input/libreal/sdpplin.c @@ -15,12 +15,9 @@ * * You should have received a copy of the GNU General Public 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: sdpplin.c,v 1.8 2006/12/25 16:21:56 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * sdp/sdpplin parser. - * */ #define LOG_MODULE "sdpplin" diff --git a/src/input/libreal/sdpplin.h b/src/input/libreal/sdpplin.h index ae03cf0cf..cb3b434d4 100644 --- a/src/input/libreal/sdpplin.h +++ b/src/input/libreal/sdpplin.h @@ -15,12 +15,9 @@ * * You should have received a copy of the GNU General Public 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: sdpplin.h,v 1.2 2003/12/09 00:02:30 f1rmb Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * sdp/sdpplin parser. - * */ #ifndef HAVE_SDPPLIN_H diff --git a/src/input/librtsp/rtsp.c b/src/input/librtsp/rtsp.c index ffe181547..530ffc6cf 100644 --- a/src/input/librtsp/rtsp.c +++ b/src/input/librtsp/rtsp.c @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: rtsp.c,v 1.21 2006/06/20 01:07:58 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * 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 469def93d..dc2624459 100644 --- a/src/input/librtsp/rtsp.h +++ b/src/input/librtsp/rtsp.h @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: rtsp.h,v 1.4 2003/12/09 00:02:31 f1rmb Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * 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 66de10584..f3ddb59bc 100644 --- a/src/input/librtsp/rtsp_session.c +++ b/src/input/librtsp/rtsp_session.c @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: rtsp_session.c,v 1.19 2006/12/22 18:08:10 klan Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * high level interface to rtsp servers. */ diff --git a/src/input/librtsp/rtsp_session.h b/src/input/librtsp/rtsp_session.h index 649842e7a..b47db0730 100644 --- a/src/input/librtsp/rtsp_session.h +++ b/src/input/librtsp/rtsp_session.h @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: rtsp_session.h,v 1.7 2006/12/18 21:31:47 klan Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * high level interface to rtsp servers. */ diff --git a/src/input/media_helper.c b/src/input/media_helper.c index da30783b0..d2b1772a4 100644 --- a/src/input/media_helper.c +++ b/src/input/media_helper.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * */ diff --git a/src/input/media_helper.h b/src/input/media_helper.h index 3d2773428..7e6303dfd 100644 --- a/src/input/media_helper.h +++ b/src/input/media_helper.h @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * */ diff --git a/src/input/mms.c b/src/input/mms.c index db7007e49..f11a89cf3 100644 --- a/src/input/mms.c +++ b/src/input/mms.c @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: mms.c,v 1.65 2007/02/20 00:34:56 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * MMS over TCP protocol * based on work from major mms diff --git a/src/input/mms.h b/src/input/mms.h index 310a6d0cc..a483fa0c6 100644 --- a/src/input/mms.h +++ b/src/input/mms.h @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: mms.h,v 1.13 2007/01/03 15:09:42 klan Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * libmms public header */ diff --git a/src/input/mmsh.c b/src/input/mmsh.c index df8d0441f..ae1c62bc1 100644 --- a/src/input/mmsh.c +++ b/src/input/mmsh.c @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: mmsh.c,v 1.42 2007/01/11 16:20:55 klan Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * MMS over HTTP protocol * written by Thibaut Mattern diff --git a/src/input/mmsh.h b/src/input/mmsh.h index 1ded6295a..633d3b5f6 100644 --- a/src/input/mmsh.h +++ b/src/input/mmsh.h @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: mmsh.h,v 1.6 2007/01/09 20:51:00 klan Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * libmmsh public header */ diff --git a/src/input/net_buf_ctrl.c b/src/input/net_buf_ctrl.c index 86514cdea..624af4081 100644 --- a/src/input/net_buf_ctrl.c +++ b/src/input/net_buf_ctrl.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * network buffering control */ diff --git a/src/input/net_buf_ctrl.h b/src/input/net_buf_ctrl.h index c3ef554fb..79f698008 100644 --- a/src/input/net_buf_ctrl.h +++ b/src/input/net_buf_ctrl.h @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * network buffering control */ diff --git a/src/input/pnm.c b/src/input/pnm.c index cba0aff1f..38d65b850 100644 --- a/src/input/pnm.c +++ b/src/input/pnm.c @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: pnm.c,v 1.22 2006/06/20 01:46:41 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * pnm protocol implementation * based upon code from joschka diff --git a/src/input/pnm.h b/src/input/pnm.h index 2970ed711..838fbadcc 100644 --- a/src/input/pnm.h +++ b/src/input/pnm.h @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: pnm.h,v 1.5 2003/12/09 00:02:30 f1rmb Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * 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/vcdio.c b/src/input/vcd/vcdio.c index 387397cf4..b3194e281 100644 --- a/src/input/vcd/vcdio.c +++ b/src/input/vcd/vcdio.c @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ diff --git a/src/input/vcd/vcdio.h b/src/input/vcd/vcdio.h index bd9daf3b6..145bb4d7f 100644 --- a/src/input/vcd/vcdio.h +++ b/src/input/vcd/vcdio.h @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ diff --git a/src/input/vcd/vcdplayer.c b/src/input/vcd/vcdplayer.c index 502d736cc..7f9189cba 100644 --- a/src/input/vcd/vcdplayer.c +++ b/src/input/vcd/vcdplayer.c @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ diff --git a/src/input/vcd/vcdplayer.h b/src/input/vcd/vcdplayer.h index 9a9ed7a1b..868ca32e4 100644 --- a/src/input/vcd/vcdplayer.h +++ b/src/input/vcd/vcdplayer.h @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ diff --git a/src/input/vcd/xine-extra.c b/src/input/vcd/xine-extra.c index 90c729181..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> @@ -15,7 +14,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA These are routines that probably should be in xine, but for whatever reason aren't - yet. diff --git a/src/input/vcd/xine-extra.h b/src/input/vcd/xine-extra.h index 2f8b12a71..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> @@ -15,7 +14,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA These are routines that probably should be in xine, but for whatever reason aren't - yet. diff --git a/src/input/vcd/xineplug_inp_vcd.c b/src/input/vcd/xineplug_inp_vcd.c index 795a2480d..2e52ccc0f 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> @@ -15,7 +14,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ /* diff --git a/src/input/videodev2.h b/src/input/videodev2.h index ac5a689ee..ce32ec9eb 100644 --- a/src/input/videodev2.h +++ b/src/input/videodev2.h @@ -1,41 +1,84 @@ -#ifndef __LINUX_VIDEODEV2_H -#define __LINUX_VIDEODEV2_H /* - * Video for Linux Two + * Video for Linux Two header file + * + * Copyright (C) 1999-2007 the contributors + * + * This program 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. + * + * This program 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. + * + * Alternatively you can redistribute this file under the terms of the + * BSD license as stated below: * - * Header file for v4l or V4L2 drivers and applications, for - * Linux kernels 2.2.x or 2.4.x. + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * 3. The names of its contributors may not be used to endorse or promote + * products derived from this software without specific prior written + * permission. * - * See http://bytesex.org/v4l/ for API specs and other - * v4l2 documentation. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED + * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * Author: Bill Dirks <bdirks@pacbell.net> + * Header file for v4l or V4L2 drivers and applications + * with public API. + * All kernel-specific stuff were moved to media/v4l2-dev.h, so + * no #if __KERNEL tests are allowed here + * + * See http://linuxtv.org for more info + * + * Author: Bill Dirks <bill@thedirks.org> * Justin Schoeman + * Hans Verkuil <hverkuil@xs4all.nl> * et al. */ -#include <sys/time.h> /* need struct timeval */ -#ifdef HAVE_ASM_TYPES_H -# include <asm/types.h> -#else -# include <inttypes.h> -# ifndef __u8 -# define __u8 uint8_t -# endif -# ifndef __u32 -# define __u32 uint32_t -# endif -# ifndef __u64 -# define __u64 uint64_t -# endif -# ifndef __s32 -# define __s32 int32_t -# endif -#endif +#ifndef __LINUX_VIDEODEV2_H +#define __LINUX_VIDEODEV2_H +#define __user +#include <sys/time.h> +#include <linux/types.h> -#ifdef __ICC - /* __u64 will be undefined for icc, so we handle it here */ - #define __u64 unsigned long long -#endif +/* + * Common stuff for both V4L1 and V4L2 + * Moved from videodev.h + */ +#define VIDEO_MAX_FRAME 32 + +#define VID_TYPE_CAPTURE 1 /* Can capture */ +#define VID_TYPE_TUNER 2 /* Can tune */ +#define VID_TYPE_TELETEXT 4 /* Does teletext */ +#define VID_TYPE_OVERLAY 8 /* Overlay onto frame buffer */ +#define VID_TYPE_CHROMAKEY 16 /* Overlay by chromakey */ +#define VID_TYPE_CLIPPING 32 /* Can clip */ +#define VID_TYPE_FRAMERAM 64 /* Uses the frame buffer memory */ +#define VID_TYPE_SCALES 128 /* Scalable */ +#define VID_TYPE_MONOCHROME 256 /* Monochrome only */ +#define VID_TYPE_SUBCAPTURE 512 /* Can capture subareas of the image */ +#define VID_TYPE_MPEG_DECODER 1024 /* Can decode MPEG streams */ +#define VID_TYPE_MPEG_ENCODER 2048 /* Can encode MPEG streams */ +#define VID_TYPE_MJPEG_DECODER 4096 /* Can decode MJPEG streams */ +#define VID_TYPE_MJPEG_ENCODER 8192 /* Can encode MJPEG streams */ /* * M I S C E L L A N E O U S @@ -43,48 +86,66 @@ /* Four-character-code (FOURCC) */ #define v4l2_fourcc(a,b,c,d)\ - (((__u32)(a)<<0)|((__u32)(b)<<8)|((__u32)(c)<<16)|((__u32)(d)<<24)) + (((__u32)(a)<<0)|((__u32)(b)<<8)|((__u32)(c)<<16)|((__u32)(d)<<24)) /* * E N U M S */ enum v4l2_field { - V4L2_FIELD_ANY = 0, /* driver can choose from none, - top, bottom, interlaced - depending on whatever it thinks - is approximate ... */ - V4L2_FIELD_NONE = 1, /* this device has no fields ... */ - V4L2_FIELD_TOP = 2, /* top field only */ - V4L2_FIELD_BOTTOM = 3, /* bottom field only */ - V4L2_FIELD_INTERLACED = 4, /* both fields interlaced */ - V4L2_FIELD_SEQ_TB = 5, /* both fields sequential into one - buffer, top-bottom order */ - V4L2_FIELD_SEQ_BT = 6, /* same as above + bottom-top order */ - V4L2_FIELD_ALTERNATE = 7, /* both fields alternating into - separate buffers */ + V4L2_FIELD_ANY = 0, /* driver can choose from none, + top, bottom, interlaced + depending on whatever it thinks + is approximate ... */ + V4L2_FIELD_NONE = 1, /* this device has no fields ... */ + V4L2_FIELD_TOP = 2, /* top field only */ + V4L2_FIELD_BOTTOM = 3, /* bottom field only */ + V4L2_FIELD_INTERLACED = 4, /* both fields interlaced */ + V4L2_FIELD_SEQ_TB = 5, /* both fields sequential into one + buffer, top-bottom order */ + V4L2_FIELD_SEQ_BT = 6, /* same as above + bottom-top order */ + V4L2_FIELD_ALTERNATE = 7, /* both fields alternating into + separate buffers */ + V4L2_FIELD_INTERLACED_TB = 8, /* both fields interlaced, top field + first and the top field is + transmitted first */ + V4L2_FIELD_INTERLACED_BT = 9, /* both fields interlaced, top field + first and the bottom field is + transmitted first */ }; #define V4L2_FIELD_HAS_TOP(field) \ ((field) == V4L2_FIELD_TOP ||\ (field) == V4L2_FIELD_INTERLACED ||\ + (field) == V4L2_FIELD_INTERLACED_TB ||\ + (field) == V4L2_FIELD_INTERLACED_BT ||\ (field) == V4L2_FIELD_SEQ_TB ||\ (field) == V4L2_FIELD_SEQ_BT) #define V4L2_FIELD_HAS_BOTTOM(field) \ ((field) == V4L2_FIELD_BOTTOM ||\ (field) == V4L2_FIELD_INTERLACED ||\ + (field) == V4L2_FIELD_INTERLACED_TB ||\ + (field) == V4L2_FIELD_INTERLACED_BT ||\ (field) == V4L2_FIELD_SEQ_TB ||\ (field) == V4L2_FIELD_SEQ_BT) #define V4L2_FIELD_HAS_BOTH(field) \ ((field) == V4L2_FIELD_INTERLACED ||\ - (field) == V4L2_FIELD_SEQ_TB ||\ + (field) == V4L2_FIELD_INTERLACED_TB ||\ + (field) == V4L2_FIELD_INTERLACED_BT ||\ + (field) == V4L2_FIELD_SEQ_TB ||\ (field) == V4L2_FIELD_SEQ_BT) enum v4l2_buf_type { - V4L2_BUF_TYPE_VIDEO_CAPTURE = 1, - V4L2_BUF_TYPE_VIDEO_OUTPUT = 2, - V4L2_BUF_TYPE_VIDEO_OVERLAY = 3, - V4L2_BUF_TYPE_VBI_CAPTURE = 4, - V4L2_BUF_TYPE_VBI_OUTPUT = 5, - V4L2_BUF_TYPE_PRIVATE = 0x80, + V4L2_BUF_TYPE_VIDEO_CAPTURE = 1, + V4L2_BUF_TYPE_VIDEO_OUTPUT = 2, + V4L2_BUF_TYPE_VIDEO_OVERLAY = 3, + V4L2_BUF_TYPE_VBI_CAPTURE = 4, + V4L2_BUF_TYPE_VBI_OUTPUT = 5, + V4L2_BUF_TYPE_SLICED_VBI_CAPTURE = 6, + V4L2_BUF_TYPE_SLICED_VBI_OUTPUT = 7, +#if 1 + /* Experimental */ + V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY = 8, +#endif + V4L2_BUF_TYPE_PRIVATE = 0x80, }; enum v4l2_ctrl_type { @@ -92,11 +153,14 @@ enum v4l2_ctrl_type { V4L2_CTRL_TYPE_BOOLEAN = 2, V4L2_CTRL_TYPE_MENU = 3, V4L2_CTRL_TYPE_BUTTON = 4, + V4L2_CTRL_TYPE_INTEGER64 = 5, + V4L2_CTRL_TYPE_CTRL_CLASS = 6, }; enum v4l2_tuner_type { V4L2_TUNER_RADIO = 1, V4L2_TUNER_ANALOG_TV = 2, + V4L2_TUNER_DIGITAL_TV = 3, }; enum v4l2_memory { @@ -115,24 +179,32 @@ enum v4l2_colorspace { /* HD and modern captures. */ V4L2_COLORSPACE_REC709 = 3, - + /* broken BT878 extents (601, luma range 16-253 instead of 16-235) */ V4L2_COLORSPACE_BT878 = 4, - + /* These should be useful. Assume 601 extents. */ V4L2_COLORSPACE_470_SYSTEM_M = 5, V4L2_COLORSPACE_470_SYSTEM_BG = 6, - + /* I know there will be cameras that send this. So, this is * unspecified chromaticities and full 0-255 on each of the * Y'CbCr components */ V4L2_COLORSPACE_JPEG = 7, - + /* For RGB colourspaces, this is probably a good start. */ V4L2_COLORSPACE_SRGB = 8, }; +enum v4l2_priority { + V4L2_PRIORITY_UNSET = 0, /* not initialized */ + V4L2_PRIORITY_BACKGROUND = 1, + V4L2_PRIORITY_INTERACTIVE = 2, + V4L2_PRIORITY_RECORD = 3, + V4L2_PRIORITY_DEFAULT = V4L2_PRIORITY_INTERACTIVE, +}; + struct v4l2_rect { __s32 left; __s32 top; @@ -152,44 +224,47 @@ struct v4l2_capability { __u8 driver[16]; /* i.e. "bttv" */ __u8 card[32]; /* i.e. "Hauppauge WinTV" */ - __u8 bus_info[32]; /* "PCI:" + pci_dev->slot_name */ + __u8 bus_info[32]; /* "PCI:" + pci_name(pci_dev) */ __u32 version; /* should use KERNEL_VERSION() */ __u32 capabilities; /* Device capabilities */ __u32 reserved[4]; }; /* Values for 'capabilities' field */ -#define V4L2_CAP_VIDEO_CAPTURE 0x00000001 /* Is a video capture device */ -#define V4L2_CAP_VIDEO_OUTPUT 0x00000002 /* Is a video output device */ -#define V4L2_CAP_VIDEO_OVERLAY 0x00000004 /* Can do video overlay */ -#define V4L2_CAP_VBI_CAPTURE 0x00000010 /* Is a VBI capture device */ -#define V4L2_CAP_VBI_OUTPUT 0x00000020 /* Is a VBI output device */ -#define V4L2_CAP_RDS_CAPTURE 0x00000100 /* RDS data capture */ - -#define V4L2_CAP_TUNER 0x00010000 /* Has a tuner */ -#define V4L2_CAP_AUDIO 0x00020000 /* has audio support */ - -#define V4L2_CAP_READWRITE 0x01000000 /* read/write systemcalls */ -#define V4L2_CAP_ASYNCIO 0x02000000 /* async I/O */ -#define V4L2_CAP_STREAMING 0x04000000 /* streaming I/O ioctls */ +#define V4L2_CAP_VIDEO_CAPTURE 0x00000001 /* Is a video capture device */ +#define V4L2_CAP_VIDEO_OUTPUT 0x00000002 /* Is a video output device */ +#define V4L2_CAP_VIDEO_OVERLAY 0x00000004 /* Can do video overlay */ +#define V4L2_CAP_VBI_CAPTURE 0x00000010 /* Is a raw VBI capture device */ +#define V4L2_CAP_VBI_OUTPUT 0x00000020 /* Is a raw VBI output device */ +#define V4L2_CAP_SLICED_VBI_CAPTURE 0x00000040 /* Is a sliced VBI capture device */ +#define V4L2_CAP_SLICED_VBI_OUTPUT 0x00000080 /* Is a sliced VBI output device */ +#define V4L2_CAP_RDS_CAPTURE 0x00000100 /* RDS data capture */ +#define V4L2_CAP_VIDEO_OUTPUT_OVERLAY 0x00000200 /* Can do video output overlay */ + +#define V4L2_CAP_TUNER 0x00010000 /* has a tuner */ +#define V4L2_CAP_AUDIO 0x00020000 /* has audio support */ +#define V4L2_CAP_RADIO 0x00040000 /* is a radio device */ + +#define V4L2_CAP_READWRITE 0x01000000 /* read/write systemcalls */ +#define V4L2_CAP_ASYNCIO 0x02000000 /* async I/O */ +#define V4L2_CAP_STREAMING 0x04000000 /* streaming I/O ioctls */ /* * V I D E O I M A G E F O R M A T */ - struct v4l2_pix_format { - __u32 width; - __u32 height; - __u32 pixelformat; + __u32 width; + __u32 height; + __u32 pixelformat; enum v4l2_field field; __u32 bytesperline; /* for padding, zero if unused */ - __u32 sizeimage; - enum v4l2_colorspace colorspace; + __u32 sizeimage; + enum v4l2_colorspace colorspace; __u32 priv; /* private data, depends on pixelformat */ }; -/* Pixel format FOURCC depth Description */ +/* Pixel format FOURCC depth Description */ #define V4L2_PIX_FMT_RGB332 v4l2_fourcc('R','G','B','1') /* 8 RGB-3-3-2 */ #define V4L2_PIX_FMT_RGB555 v4l2_fourcc('R','G','B','O') /* 16 RGB-5-5-5 */ #define V4L2_PIX_FMT_RGB565 v4l2_fourcc('R','G','B','P') /* 16 RGB-5-6-5 */ @@ -217,31 +292,115 @@ struct v4l2_pix_format #define V4L2_PIX_FMT_YUV420 v4l2_fourcc('Y','U','1','2') /* 12 YUV 4:2:0 */ #define V4L2_PIX_FMT_YYUV v4l2_fourcc('Y','Y','U','V') /* 16 YUV 4:2:2 */ #define V4L2_PIX_FMT_HI240 v4l2_fourcc('H','I','2','4') /* 8 8-bit color */ +#define V4L2_PIX_FMT_HM12 v4l2_fourcc('H','M','1','2') /* 8 YUV 4:2:0 16x16 macroblocks */ +#define V4L2_PIX_FMT_RGB444 v4l2_fourcc('R','4','4','4') /* 16 xxxxrrrr ggggbbbb */ + +/* see http://www.siliconimaging.com/RGB%20Bayer.htm */ +#define V4L2_PIX_FMT_SBGGR8 v4l2_fourcc('B','A','8','1') /* 8 BGBG.. GRGR.. */ /* compressed formats */ #define V4L2_PIX_FMT_MJPEG v4l2_fourcc('M','J','P','G') /* Motion-JPEG */ #define V4L2_PIX_FMT_JPEG v4l2_fourcc('J','P','E','G') /* JFIF JPEG */ #define V4L2_PIX_FMT_DV v4l2_fourcc('d','v','s','d') /* 1394 */ -#define V4L2_PIX_FMT_MPEG v4l2_fourcc('M','P','E','G') /* MPEG */ +#define V4L2_PIX_FMT_MPEG v4l2_fourcc('M','P','E','G') /* MPEG-1/2/4 */ /* Vendor-specific formats */ -#define V4L2_PIX_FMT_WNVA v4l2_fourcc('W','N','V','A') /* Winnov hw compres */ +#define V4L2_PIX_FMT_WNVA v4l2_fourcc('W','N','V','A') /* Winnov hw compress */ +#define V4L2_PIX_FMT_SN9C10X v4l2_fourcc('S','9','1','0') /* SN9C10x compression */ +#define V4L2_PIX_FMT_PWC1 v4l2_fourcc('P','W','C','1') /* pwc older webcam */ +#define V4L2_PIX_FMT_PWC2 v4l2_fourcc('P','W','C','2') /* pwc newer webcam */ +#define V4L2_PIX_FMT_ET61X251 v4l2_fourcc('E','6','2','5') /* ET61X251 compression */ /* * F O R M A T E N U M E R A T I O N */ struct v4l2_fmtdesc { - __u32 index; /* Format number */ + __u32 index; /* Format number */ enum v4l2_buf_type type; /* buffer type */ __u32 flags; - __u8 description[32]; /* Description string */ - __u32 pixelformat; /* Format fourcc */ - __u32 reserved[4]; + __u8 description[32]; /* Description string */ + __u32 pixelformat; /* Format fourcc */ + __u32 reserved[4]; }; #define V4L2_FMT_FLAG_COMPRESSED 0x0001 +#if 1 + /* Experimental Frame Size and frame rate enumeration */ +/* + * F R A M E S I Z E E N U M E R A T I O N + */ +enum v4l2_frmsizetypes +{ + V4L2_FRMSIZE_TYPE_DISCRETE = 1, + V4L2_FRMSIZE_TYPE_CONTINUOUS = 2, + V4L2_FRMSIZE_TYPE_STEPWISE = 3, +}; + +struct v4l2_frmsize_discrete +{ + __u32 width; /* Frame width [pixel] */ + __u32 height; /* Frame height [pixel] */ +}; + +struct v4l2_frmsize_stepwise +{ + __u32 min_width; /* Minimum frame width [pixel] */ + __u32 max_width; /* Maximum frame width [pixel] */ + __u32 step_width; /* Frame width step size [pixel] */ + __u32 min_height; /* Minimum frame height [pixel] */ + __u32 max_height; /* Maximum frame height [pixel] */ + __u32 step_height; /* Frame height step size [pixel] */ +}; + +struct v4l2_frmsizeenum +{ + __u32 index; /* Frame size number */ + __u32 pixel_format; /* Pixel format */ + __u32 type; /* Frame size type the device supports. */ + + union { /* Frame size */ + struct v4l2_frmsize_discrete discrete; + struct v4l2_frmsize_stepwise stepwise; + }; + + __u32 reserved[2]; /* Reserved space for future use */ +}; + +/* + * F R A M E R A T E E N U M E R A T I O N + */ +enum v4l2_frmivaltypes +{ + V4L2_FRMIVAL_TYPE_DISCRETE = 1, + V4L2_FRMIVAL_TYPE_CONTINUOUS = 2, + V4L2_FRMIVAL_TYPE_STEPWISE = 3, +}; + +struct v4l2_frmival_stepwise +{ + struct v4l2_fract min; /* Minimum frame interval [s] */ + struct v4l2_fract max; /* Maximum frame interval [s] */ + struct v4l2_fract step; /* Frame interval step size [s] */ +}; + +struct v4l2_frmivalenum +{ + __u32 index; /* Frame format index */ + __u32 pixel_format; /* Pixel format */ + __u32 width; /* Frame width */ + __u32 height; /* Frame height */ + __u32 type; /* Frame interval type the device supports. */ + + union { /* Frame interval */ + struct v4l2_fract discrete; + struct v4l2_frmival_stepwise stepwise; + }; + + __u32 reserved[2]; /* Reserved space for future use */ +}; +#endif /* * T I M E C O D E @@ -273,22 +432,6 @@ struct v4l2_timecode /* The above is based on SMPTE timecodes */ -/* - * C O M P R E S S I O N P A R A M E T E R S - */ -#if 0 -/* ### generic compression settings don't work, there is too much - * ### codec-specific stuff. Maybe reuse that for MPEG codec settings - * ### later ... */ -struct v4l2_compression -{ - __u32 quality; - __u32 keyframerate; - __u32 pframerate; - __u32 reserved[5]; -}; -#endif - struct v4l2_jpegcompression { int quality; @@ -297,10 +440,10 @@ struct v4l2_jpegcompression * must be 0..15 */ int APP_len; /* Length of data in JPEG APPn segment */ char APP_data[60]; /* Data in the JPEG APPn segment. */ - + int COM_len; /* Length of data in JPEG COM segment */ char COM_data[60]; /* Data in JPEG COM segment */ - + __u32 jpeg_markers; /* Which markers should go into the JPEG * output. Unless you exactly know what * you do, leave them untouched. @@ -310,25 +453,24 @@ struct v4l2_jpegcompression * The presence of the APP and COM marker * is influenced by APP_len and COM_len * ONLY, not by this property! */ - + #define V4L2_JPEG_MARKER_DHT (1<<3) /* Define Huffman Tables */ #define V4L2_JPEG_MARKER_DQT (1<<4) /* Define Quantization Tables */ #define V4L2_JPEG_MARKER_DRI (1<<5) /* Define Restart Interval */ #define V4L2_JPEG_MARKER_COM (1<<6) /* Comment segment */ #define V4L2_JPEG_MARKER_APP (1<<7) /* App segment, driver will - * allways use APP0 */ + * allways use APP0 */ }; - /* * M E M O R Y - M A P P I N G B U F F E R S */ struct v4l2_requestbuffers { - __u32 count; + __u32 count; enum v4l2_buf_type type; enum v4l2_memory memory; - __u32 reserved[2]; + __u32 reserved[2]; }; struct v4l2_buffer @@ -349,8 +491,8 @@ struct v4l2_buffer unsigned long userptr; } m; __u32 length; - - __u32 reserved[2]; + __u32 input; + __u32 reserved; }; /* Flags for 'flags' field */ @@ -361,6 +503,7 @@ struct v4l2_buffer #define V4L2_BUF_FLAG_PFRAME 0x0010 /* Image is a P-frame */ #define V4L2_BUF_FLAG_BFRAME 0x0020 /* Image is a B-frame */ #define V4L2_BUF_FLAG_TIMECODE 0x0100 /* timecode field is valid */ +#define V4L2_BUF_FLAG_INPUT 0x0200 /* input field is valid */ /* * O V E R L A Y P R E V I E W @@ -379,15 +522,21 @@ struct v4l2_framebuffer #define V4L2_FBUF_CAP_CHROMAKEY 0x0002 #define V4L2_FBUF_CAP_LIST_CLIPPING 0x0004 #define V4L2_FBUF_CAP_BITMAP_CLIPPING 0x0008 +#define V4L2_FBUF_CAP_LOCAL_ALPHA 0x0010 +#define V4L2_FBUF_CAP_GLOBAL_ALPHA 0x0020 +#define V4L2_FBUF_CAP_LOCAL_INV_ALPHA 0x0040 /* Flags for the 'flags' field. */ #define V4L2_FBUF_FLAG_PRIMARY 0x0001 #define V4L2_FBUF_FLAG_OVERLAY 0x0002 #define V4L2_FBUF_FLAG_CHROMAKEY 0x0004 +#define V4L2_FBUF_FLAG_LOCAL_ALPHA 0x0008 +#define V4L2_FBUF_FLAG_GLOBAL_ALPHA 0x0010 +#define V4L2_FBUF_FLAG_LOCAL_INV_ALPHA 0x0020 struct v4l2_clip { struct v4l2_rect c; - struct v4l2_clip *next; + struct v4l2_clip *next; }; struct v4l2_window @@ -395,12 +544,12 @@ struct v4l2_window struct v4l2_rect w; enum v4l2_field field; __u32 chromakey; - struct v4l2_clip *clips; + struct v4l2_clip *clips; __u32 clipcount; - void *bitmap; + void *bitmap; + __u8 global_alpha; }; - /* * C A P T U R E P A R A M E T E R S */ @@ -413,6 +562,7 @@ struct v4l2_captureparm __u32 readbuffers; /* # of buffers for read */ __u32 reserved[4]; }; + /* Flags for 'capability' and 'capturemode' fields */ #define V4L2_MODE_HIGHQUALITY 0x0001 /* High quality imaging mode */ #define V4L2_CAP_TIMEPERFRAME 0x1000 /* timeperframe field is supported */ @@ -430,12 +580,11 @@ struct v4l2_outputparm /* * I N P U T I M A G E C R O P P I N G */ - struct v4l2_cropcap { - enum v4l2_buf_type type; - struct v4l2_rect bounds; - struct v4l2_rect defrect; - struct v4l2_fract pixelaspect; + enum v4l2_buf_type type; + struct v4l2_rect bounds; + struct v4l2_rect defrect; + struct v4l2_fract pixelaspect; }; struct v4l2_crop { @@ -466,6 +615,8 @@ typedef __u64 v4l2_std_id; #define V4L2_STD_NTSC_M ((v4l2_std_id)0x00001000) #define V4L2_STD_NTSC_M_JP ((v4l2_std_id)0x00002000) +#define V4L2_STD_NTSC_443 ((v4l2_std_id)0x00004000) +#define V4L2_STD_NTSC_M_KR ((v4l2_std_id)0x00008000) #define V4L2_STD_SECAM_B ((v4l2_std_id)0x00010000) #define V4L2_STD_SECAM_D ((v4l2_std_id)0x00020000) @@ -474,11 +625,27 @@ typedef __u64 v4l2_std_id; #define V4L2_STD_SECAM_K ((v4l2_std_id)0x00100000) #define V4L2_STD_SECAM_K1 ((v4l2_std_id)0x00200000) #define V4L2_STD_SECAM_L ((v4l2_std_id)0x00400000) +#define V4L2_STD_SECAM_LC ((v4l2_std_id)0x00800000) /* ATSC/HDTV */ #define V4L2_STD_ATSC_8_VSB ((v4l2_std_id)0x01000000) #define V4L2_STD_ATSC_16_VSB ((v4l2_std_id)0x02000000) +/* FIXME: + Although std_id is 64 bits, there is an issue on PPC32 architecture that + makes switch(__u64) to break. So, there's a hack on v4l2-common.c rounding + this value to 32 bits. + As, currently, the max value is for V4L2_STD_ATSC_16_VSB (30 bits wide), + it should work fine. However, if needed to add more than two standards, + v4l2-common.c should be fixed. + */ + +/* some merged standards */ +#define V4L2_STD_MN (V4L2_STD_PAL_M|V4L2_STD_PAL_N|V4L2_STD_PAL_Nc|V4L2_STD_NTSC) +#define V4L2_STD_B (V4L2_STD_PAL_B|V4L2_STD_PAL_B1|V4L2_STD_SECAM_B) +#define V4L2_STD_GH (V4L2_STD_PAL_G|V4L2_STD_PAL_H|V4L2_STD_SECAM_G|V4L2_STD_SECAM_H) +#define V4L2_STD_DK (V4L2_STD_PAL_DK|V4L2_STD_SECAM_DK) + /* some common needed stuff */ #define V4L2_STD_PAL_BG (V4L2_STD_PAL_B |\ V4L2_STD_PAL_B1 |\ @@ -491,22 +658,28 @@ typedef __u64 v4l2_std_id; V4L2_STD_PAL_H |\ V4L2_STD_PAL_I) #define V4L2_STD_NTSC (V4L2_STD_NTSC_M |\ - V4L2_STD_NTSC_M_JP) + V4L2_STD_NTSC_M_JP |\ + V4L2_STD_NTSC_M_KR) +#define V4L2_STD_SECAM_DK (V4L2_STD_SECAM_D |\ + V4L2_STD_SECAM_K |\ + V4L2_STD_SECAM_K1) #define V4L2_STD_SECAM (V4L2_STD_SECAM_B |\ - V4L2_STD_SECAM_D |\ V4L2_STD_SECAM_G |\ V4L2_STD_SECAM_H |\ - V4L2_STD_SECAM_K |\ - V4L2_STD_SECAM_K1 |\ - V4L2_STD_SECAM_L) + V4L2_STD_SECAM_DK |\ + V4L2_STD_SECAM_L |\ + V4L2_STD_SECAM_LC) #define V4L2_STD_525_60 (V4L2_STD_PAL_M |\ V4L2_STD_PAL_60 |\ - V4L2_STD_NTSC) + V4L2_STD_NTSC |\ + V4L2_STD_NTSC_443) #define V4L2_STD_625_50 (V4L2_STD_PAL |\ V4L2_STD_PAL_N |\ V4L2_STD_PAL_Nc |\ V4L2_STD_SECAM) +#define V4L2_STD_ATSC (V4L2_STD_ATSC_8_VSB |\ + V4L2_STD_ATSC_16_VSB) #define V4L2_STD_UNKNOWN 0 #define V4L2_STD_ALL (V4L2_STD_525_60 |\ @@ -514,7 +687,7 @@ typedef __u64 v4l2_std_id; struct v4l2_standard { - __u32 index; + __u32 index; v4l2_std_id id; __u8 name[24]; struct v4l2_fract frameperiod; /* Frames, not fields */ @@ -522,21 +695,21 @@ struct v4l2_standard __u32 reserved[4]; }; - /* * V I D E O I N P U T S */ struct v4l2_input { __u32 index; /* Which input */ - __u8 name[32]; /* Label */ + __u8 name[32]; /* Label */ __u32 type; /* Type of input */ - __u32 audioset; /* Associated audios (bitfield) */ + __u32 audioset; /* Associated audios (bitfield) */ __u32 tuner; /* Associated tuner */ v4l2_std_id std; __u32 status; __u32 reserved[4]; }; + /* Values for the 'type' field */ #define V4L2_INPUT_TYPE_TUNER 1 #define V4L2_INPUT_TYPE_CAMERA 2 @@ -566,9 +739,9 @@ struct v4l2_input struct v4l2_output { __u32 index; /* Which output */ - __u8 name[32]; /* Label */ + __u8 name[32]; /* Label */ __u32 type; /* Type of output */ - __u32 audioset; /* Associated audios (bitfield) */ + __u32 audioset; /* Associated audios (bitfield) */ __u32 modulator; /* Associated modulator */ v4l2_std_id std; __u32 reserved[4]; @@ -587,15 +760,43 @@ struct v4l2_control __s32 value; }; +struct v4l2_ext_control +{ + __u32 id; + __u32 reserved2[2]; + union { + __s32 value; + __s64 value64; + void *reserved; + }; +} __attribute__ ((packed)); + +struct v4l2_ext_controls +{ + __u32 ctrl_class; + __u32 count; + __u32 error_idx; + __u32 reserved[2]; + struct v4l2_ext_control *controls; +}; + +/* Values for ctrl_class field */ +#define V4L2_CTRL_CLASS_USER 0x00980000 /* Old-style 'user' controls */ +#define V4L2_CTRL_CLASS_MPEG 0x00990000 /* MPEG-compression controls */ + +#define V4L2_CTRL_ID_MASK (0x0fffffff) +#define V4L2_CTRL_ID2CLASS(id) ((id) & 0x0fff0000UL) +#define V4L2_CTRL_DRIVER_PRIV(id) (((id) & 0xffff) >= 0x1000) + /* Used in the VIDIOC_QUERYCTRL ioctl for querying controls */ struct v4l2_queryctrl { - __u32 id; + __u32 id; enum v4l2_ctrl_type type; __u8 name[32]; /* Whatever */ __s32 minimum; /* Note signedness */ __s32 maximum; - __s32 step; + __s32 step; __s32 default_value; __u32 flags; __u32 reserved[2]; @@ -613,12 +814,21 @@ struct v4l2_querymenu /* Control flags */ #define V4L2_CTRL_FLAG_DISABLED 0x0001 #define V4L2_CTRL_FLAG_GRABBED 0x0002 +#define V4L2_CTRL_FLAG_READ_ONLY 0x0004 +#define V4L2_CTRL_FLAG_UPDATE 0x0008 +#define V4L2_CTRL_FLAG_INACTIVE 0x0010 +#define V4L2_CTRL_FLAG_SLIDER 0x0020 -/* Control IDs defined by V4L2 */ -#define V4L2_CID_BASE 0x00980900 +/* Query flag, to be ORed with the control ID */ +#define V4L2_CTRL_FLAG_NEXT_CTRL 0x80000000 + +/* User-class control IDs defined by V4L2 */ +#define V4L2_CID_BASE (V4L2_CTRL_CLASS_USER | 0x900) +#define V4L2_CID_USER_BASE V4L2_CID_BASE /* IDs reserved for driver specific controls */ #define V4L2_CID_PRIVATE_BASE 0x08000000 +#define V4L2_CID_USER_CLASS (V4L2_CTRL_CLASS_USER | 1) #define V4L2_CID_BRIGHTNESS (V4L2_CID_BASE+0) #define V4L2_CID_CONTRAST (V4L2_CID_BASE+1) #define V4L2_CID_SATURATION (V4L2_CID_BASE+2) @@ -645,6 +855,192 @@ struct v4l2_querymenu #define V4L2_CID_VCENTER (V4L2_CID_BASE+23) #define V4L2_CID_LASTP1 (V4L2_CID_BASE+24) /* last CID + 1 */ +/* MPEG-class control IDs defined by V4L2 */ +#define V4L2_CID_MPEG_BASE (V4L2_CTRL_CLASS_MPEG | 0x900) +#define V4L2_CID_MPEG_CLASS (V4L2_CTRL_CLASS_MPEG | 1) + +/* MPEG streams */ +#define V4L2_CID_MPEG_STREAM_TYPE (V4L2_CID_MPEG_BASE+0) +enum v4l2_mpeg_stream_type { + V4L2_MPEG_STREAM_TYPE_MPEG2_PS = 0, /* MPEG-2 program stream */ + V4L2_MPEG_STREAM_TYPE_MPEG2_TS = 1, /* MPEG-2 transport stream */ + V4L2_MPEG_STREAM_TYPE_MPEG1_SS = 2, /* MPEG-1 system stream */ + V4L2_MPEG_STREAM_TYPE_MPEG2_DVD = 3, /* MPEG-2 DVD-compatible stream */ + V4L2_MPEG_STREAM_TYPE_MPEG1_VCD = 4, /* MPEG-1 VCD-compatible stream */ + V4L2_MPEG_STREAM_TYPE_MPEG2_SVCD = 5, /* MPEG-2 SVCD-compatible stream */ +}; +#define V4L2_CID_MPEG_STREAM_PID_PMT (V4L2_CID_MPEG_BASE+1) +#define V4L2_CID_MPEG_STREAM_PID_AUDIO (V4L2_CID_MPEG_BASE+2) +#define V4L2_CID_MPEG_STREAM_PID_VIDEO (V4L2_CID_MPEG_BASE+3) +#define V4L2_CID_MPEG_STREAM_PID_PCR (V4L2_CID_MPEG_BASE+4) +#define V4L2_CID_MPEG_STREAM_PES_ID_AUDIO (V4L2_CID_MPEG_BASE+5) +#define V4L2_CID_MPEG_STREAM_PES_ID_VIDEO (V4L2_CID_MPEG_BASE+6) +#define V4L2_CID_MPEG_STREAM_VBI_FMT (V4L2_CID_MPEG_BASE+7) +enum v4l2_mpeg_stream_vbi_fmt { + V4L2_MPEG_STREAM_VBI_FMT_NONE = 0, /* No VBI in the MPEG stream */ + V4L2_MPEG_STREAM_VBI_FMT_IVTV = 1, /* VBI in private packets, IVTV format */ +}; + +/* MPEG audio */ +#define V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ (V4L2_CID_MPEG_BASE+100) +enum v4l2_mpeg_audio_sampling_freq { + V4L2_MPEG_AUDIO_SAMPLING_FREQ_44100 = 0, + V4L2_MPEG_AUDIO_SAMPLING_FREQ_48000 = 1, + V4L2_MPEG_AUDIO_SAMPLING_FREQ_32000 = 2, +}; +#define V4L2_CID_MPEG_AUDIO_ENCODING (V4L2_CID_MPEG_BASE+101) +enum v4l2_mpeg_audio_encoding { + V4L2_MPEG_AUDIO_ENCODING_LAYER_1 = 0, + V4L2_MPEG_AUDIO_ENCODING_LAYER_2 = 1, + V4L2_MPEG_AUDIO_ENCODING_LAYER_3 = 2, +}; +#define V4L2_CID_MPEG_AUDIO_L1_BITRATE (V4L2_CID_MPEG_BASE+102) +enum v4l2_mpeg_audio_l1_bitrate { + V4L2_MPEG_AUDIO_L1_BITRATE_32K = 0, + V4L2_MPEG_AUDIO_L1_BITRATE_64K = 1, + V4L2_MPEG_AUDIO_L1_BITRATE_96K = 2, + V4L2_MPEG_AUDIO_L1_BITRATE_128K = 3, + V4L2_MPEG_AUDIO_L1_BITRATE_160K = 4, + V4L2_MPEG_AUDIO_L1_BITRATE_192K = 5, + V4L2_MPEG_AUDIO_L1_BITRATE_224K = 6, + V4L2_MPEG_AUDIO_L1_BITRATE_256K = 7, + V4L2_MPEG_AUDIO_L1_BITRATE_288K = 8, + V4L2_MPEG_AUDIO_L1_BITRATE_320K = 9, + V4L2_MPEG_AUDIO_L1_BITRATE_352K = 10, + V4L2_MPEG_AUDIO_L1_BITRATE_384K = 11, + V4L2_MPEG_AUDIO_L1_BITRATE_416K = 12, + V4L2_MPEG_AUDIO_L1_BITRATE_448K = 13, +}; +#define V4L2_CID_MPEG_AUDIO_L2_BITRATE (V4L2_CID_MPEG_BASE+103) +enum v4l2_mpeg_audio_l2_bitrate { + V4L2_MPEG_AUDIO_L2_BITRATE_32K = 0, + V4L2_MPEG_AUDIO_L2_BITRATE_48K = 1, + V4L2_MPEG_AUDIO_L2_BITRATE_56K = 2, + V4L2_MPEG_AUDIO_L2_BITRATE_64K = 3, + V4L2_MPEG_AUDIO_L2_BITRATE_80K = 4, + V4L2_MPEG_AUDIO_L2_BITRATE_96K = 5, + V4L2_MPEG_AUDIO_L2_BITRATE_112K = 6, + V4L2_MPEG_AUDIO_L2_BITRATE_128K = 7, + V4L2_MPEG_AUDIO_L2_BITRATE_160K = 8, + V4L2_MPEG_AUDIO_L2_BITRATE_192K = 9, + V4L2_MPEG_AUDIO_L2_BITRATE_224K = 10, + V4L2_MPEG_AUDIO_L2_BITRATE_256K = 11, + V4L2_MPEG_AUDIO_L2_BITRATE_320K = 12, + V4L2_MPEG_AUDIO_L2_BITRATE_384K = 13, +}; +#define V4L2_CID_MPEG_AUDIO_L3_BITRATE (V4L2_CID_MPEG_BASE+104) +enum v4l2_mpeg_audio_l3_bitrate { + V4L2_MPEG_AUDIO_L3_BITRATE_32K = 0, + V4L2_MPEG_AUDIO_L3_BITRATE_40K = 1, + V4L2_MPEG_AUDIO_L3_BITRATE_48K = 2, + V4L2_MPEG_AUDIO_L3_BITRATE_56K = 3, + V4L2_MPEG_AUDIO_L3_BITRATE_64K = 4, + V4L2_MPEG_AUDIO_L3_BITRATE_80K = 5, + V4L2_MPEG_AUDIO_L3_BITRATE_96K = 6, + V4L2_MPEG_AUDIO_L3_BITRATE_112K = 7, + V4L2_MPEG_AUDIO_L3_BITRATE_128K = 8, + V4L2_MPEG_AUDIO_L3_BITRATE_160K = 9, + V4L2_MPEG_AUDIO_L3_BITRATE_192K = 10, + V4L2_MPEG_AUDIO_L3_BITRATE_224K = 11, + V4L2_MPEG_AUDIO_L3_BITRATE_256K = 12, + V4L2_MPEG_AUDIO_L3_BITRATE_320K = 13, +}; +#define V4L2_CID_MPEG_AUDIO_MODE (V4L2_CID_MPEG_BASE+105) +enum v4l2_mpeg_audio_mode { + V4L2_MPEG_AUDIO_MODE_STEREO = 0, + V4L2_MPEG_AUDIO_MODE_JOINT_STEREO = 1, + V4L2_MPEG_AUDIO_MODE_DUAL = 2, + V4L2_MPEG_AUDIO_MODE_MONO = 3, +}; +#define V4L2_CID_MPEG_AUDIO_MODE_EXTENSION (V4L2_CID_MPEG_BASE+106) +enum v4l2_mpeg_audio_mode_extension { + V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_4 = 0, + V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_8 = 1, + V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_12 = 2, + V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_16 = 3, +}; +#define V4L2_CID_MPEG_AUDIO_EMPHASIS (V4L2_CID_MPEG_BASE+107) +enum v4l2_mpeg_audio_emphasis { + V4L2_MPEG_AUDIO_EMPHASIS_NONE = 0, + V4L2_MPEG_AUDIO_EMPHASIS_50_DIV_15_uS = 1, + V4L2_MPEG_AUDIO_EMPHASIS_CCITT_J17 = 2, +}; +#define V4L2_CID_MPEG_AUDIO_CRC (V4L2_CID_MPEG_BASE+108) +enum v4l2_mpeg_audio_crc { + V4L2_MPEG_AUDIO_CRC_NONE = 0, + V4L2_MPEG_AUDIO_CRC_CRC16 = 1, +}; +#define V4L2_CID_MPEG_AUDIO_MUTE (V4L2_CID_MPEG_BASE+109) + +/* MPEG video */ +#define V4L2_CID_MPEG_VIDEO_ENCODING (V4L2_CID_MPEG_BASE+200) +enum v4l2_mpeg_video_encoding { + V4L2_MPEG_VIDEO_ENCODING_MPEG_1 = 0, + V4L2_MPEG_VIDEO_ENCODING_MPEG_2 = 1, +}; +#define V4L2_CID_MPEG_VIDEO_ASPECT (V4L2_CID_MPEG_BASE+201) +enum v4l2_mpeg_video_aspect { + V4L2_MPEG_VIDEO_ASPECT_1x1 = 0, + V4L2_MPEG_VIDEO_ASPECT_4x3 = 1, + V4L2_MPEG_VIDEO_ASPECT_16x9 = 2, + V4L2_MPEG_VIDEO_ASPECT_221x100 = 3, +}; +#define V4L2_CID_MPEG_VIDEO_B_FRAMES (V4L2_CID_MPEG_BASE+202) +#define V4L2_CID_MPEG_VIDEO_GOP_SIZE (V4L2_CID_MPEG_BASE+203) +#define V4L2_CID_MPEG_VIDEO_GOP_CLOSURE (V4L2_CID_MPEG_BASE+204) +#define V4L2_CID_MPEG_VIDEO_PULLDOWN (V4L2_CID_MPEG_BASE+205) +#define V4L2_CID_MPEG_VIDEO_BITRATE_MODE (V4L2_CID_MPEG_BASE+206) +enum v4l2_mpeg_video_bitrate_mode { + V4L2_MPEG_VIDEO_BITRATE_MODE_VBR = 0, + V4L2_MPEG_VIDEO_BITRATE_MODE_CBR = 1, +}; +#define V4L2_CID_MPEG_VIDEO_BITRATE (V4L2_CID_MPEG_BASE+207) +#define V4L2_CID_MPEG_VIDEO_BITRATE_PEAK (V4L2_CID_MPEG_BASE+208) +#define V4L2_CID_MPEG_VIDEO_TEMPORAL_DECIMATION (V4L2_CID_MPEG_BASE+209) +#define V4L2_CID_MPEG_VIDEO_MUTE (V4L2_CID_MPEG_BASE+210) +#define V4L2_CID_MPEG_VIDEO_MUTE_YUV (V4L2_CID_MPEG_BASE+211) + +/* MPEG-class control IDs specific to the CX2584x driver as defined by V4L2 */ +#define V4L2_CID_MPEG_CX2341X_BASE (V4L2_CTRL_CLASS_MPEG | 0x1000) +#define V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE (V4L2_CID_MPEG_CX2341X_BASE+0) +enum v4l2_mpeg_cx2341x_video_spatial_filter_mode { + V4L2_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE_MANUAL = 0, + V4L2_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE_AUTO = 1, +}; +#define V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER (V4L2_CID_MPEG_CX2341X_BASE+1) +#define V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE (V4L2_CID_MPEG_CX2341X_BASE+2) +enum v4l2_mpeg_cx2341x_video_luma_spatial_filter_type { + V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_OFF = 0, + V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_1D_HOR = 1, + V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_1D_VERT = 2, + V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_2D_HV_SEPARABLE = 3, + V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_2D_SYM_NON_SEPARABLE = 4, +}; +#define V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE (V4L2_CID_MPEG_CX2341X_BASE+3) +enum v4l2_mpeg_cx2341x_video_chroma_spatial_filter_type { + V4L2_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE_OFF = 0, + V4L2_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE_1D_HOR = 1, +}; +#define V4L2_CID_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE (V4L2_CID_MPEG_CX2341X_BASE+4) +enum v4l2_mpeg_cx2341x_video_temporal_filter_mode { + V4L2_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE_MANUAL = 0, + V4L2_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE_AUTO = 1, +}; +#define V4L2_CID_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER (V4L2_CID_MPEG_CX2341X_BASE+5) +#define V4L2_CID_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE (V4L2_CID_MPEG_CX2341X_BASE+6) +enum v4l2_mpeg_cx2341x_video_median_filter_type { + V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_OFF = 0, + V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_HOR = 1, + V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_VERT = 2, + V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_HOR_VERT = 3, + V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_DIAG = 4, +}; +#define V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_MEDIAN_FILTER_BOTTOM (V4L2_CID_MPEG_CX2341X_BASE+7) +#define V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_MEDIAN_FILTER_TOP (V4L2_CID_MPEG_CX2341X_BASE+8) +#define V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_MEDIAN_FILTER_BOTTOM (V4L2_CID_MPEG_CX2341X_BASE+9) +#define V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_MEDIAN_FILTER_TOP (V4L2_CID_MPEG_CX2341X_BASE+10) +#define V4L2_CID_MPEG_CX2341X_STREAM_INSERT_NAV_PACKETS (V4L2_CID_MPEG_CX2341X_BASE+11) + /* * T U N I N G */ @@ -695,13 +1091,14 @@ struct v4l2_modulator #define V4L2_TUNER_MODE_LANG2 0x0002 #define V4L2_TUNER_MODE_SAP 0x0002 #define V4L2_TUNER_MODE_LANG1 0x0003 +#define V4L2_TUNER_MODE_LANG1_LANG2 0x0004 struct v4l2_frequency { - __u32 tuner; + __u32 tuner; enum v4l2_tuner_type type; - __u32 frequency; - __u32 reserved[8]; + __u32 frequency; + __u32 reserved[8]; }; /* @@ -715,6 +1112,7 @@ struct v4l2_audio __u32 mode; __u32 reserved[2]; }; + /* Flags for the 'capability' field */ #define V4L2_AUDCAP_STEREO 0x00001 #define V4L2_AUDCAP_AVL 0x00002 @@ -732,11 +1130,61 @@ struct v4l2_audioout }; /* + * M P E G S E R V I C E S + * + * NOTE: EXPERIMENTAL API + */ +#if 1 +#define V4L2_ENC_IDX_FRAME_I (0) +#define V4L2_ENC_IDX_FRAME_P (1) +#define V4L2_ENC_IDX_FRAME_B (2) +#define V4L2_ENC_IDX_FRAME_MASK (0xf) + +struct v4l2_enc_idx_entry { + __u64 offset; + __u64 pts; + __u32 length; + __u32 flags; + __u32 reserved[2]; +}; + +#define V4L2_ENC_IDX_ENTRIES (64) +struct v4l2_enc_idx { + __u32 entries; + __u32 entries_cap; + __u32 reserved[4]; + struct v4l2_enc_idx_entry entry[V4L2_ENC_IDX_ENTRIES]; +}; + + +#define V4L2_ENC_CMD_START (0) +#define V4L2_ENC_CMD_STOP (1) +#define V4L2_ENC_CMD_PAUSE (2) +#define V4L2_ENC_CMD_RESUME (3) + +/* Flags for V4L2_ENC_CMD_STOP */ +#define V4L2_ENC_CMD_STOP_AT_GOP_END (1 << 0) + +struct v4l2_encoder_cmd { + __u32 cmd; + __u32 flags; + union { + struct { + __u32 data[8]; + } raw; + }; +}; + +#endif + + +/* * D A T A S E R V I C E S ( V B I ) * * Data services API by Michael Schimek */ +/* Raw VBI */ struct v4l2_vbi_format { __u32 sampling_rate; /* in 1 Hz */ @@ -753,6 +1201,58 @@ struct v4l2_vbi_format #define V4L2_VBI_UNSYNC (1<< 0) #define V4L2_VBI_INTERLACED (1<< 1) +/* Sliced VBI + * + * This implements is a proposal V4L2 API to allow SLICED VBI + * required for some hardware encoders. It should change without + * notice in the definitive implementation. + */ + +struct v4l2_sliced_vbi_format +{ + __u16 service_set; + /* service_lines[0][...] specifies lines 0-23 (1-23 used) of the first field + service_lines[1][...] specifies lines 0-23 (1-23 used) of the second field + (equals frame lines 313-336 for 625 line video + standards, 263-286 for 525 line standards) */ + __u16 service_lines[2][24]; + __u32 io_size; + __u32 reserved[2]; /* must be zero */ +}; + +/* Teletext World System Teletext + (WST), defined on ITU-R BT.653-2 */ +#define V4L2_SLICED_TELETEXT_B (0x0001) +/* Video Program System, defined on ETS 300 231*/ +#define V4L2_SLICED_VPS (0x0400) +/* Closed Caption, defined on EIA-608 */ +#define V4L2_SLICED_CAPTION_525 (0x1000) +/* Wide Screen System, defined on ITU-R BT1119.1 */ +#define V4L2_SLICED_WSS_625 (0x4000) + +#define V4L2_SLICED_VBI_525 (V4L2_SLICED_CAPTION_525) +#define V4L2_SLICED_VBI_625 (V4L2_SLICED_TELETEXT_B | V4L2_SLICED_VPS | V4L2_SLICED_WSS_625) + +struct v4l2_sliced_vbi_cap +{ + __u16 service_set; + /* service_lines[0][...] specifies lines 0-23 (1-23 used) of the first field + service_lines[1][...] specifies lines 0-23 (1-23 used) of the second field + (equals frame lines 313-336 for 625 line video + standards, 263-286 for 525 line standards) */ + __u16 service_lines[2][24]; + enum v4l2_buf_type type; + __u32 reserved[3]; /* must be 0 */ +}; + +struct v4l2_sliced_vbi_data +{ + __u32 id; + __u32 field; /* 0: first field, 1: second field */ + __u32 line; /* 1-23 */ + __u32 reserved; /* must be 0 */ + __u8 data[48]; +}; /* * A G G R E G A T E S T R U C T U R E S @@ -765,10 +1265,11 @@ struct v4l2_format enum v4l2_buf_type type; union { - struct v4l2_pix_format pix; /* V4L2_BUF_TYPE_VIDEO_CAPTURE */ - struct v4l2_window win; /* V4L2_BUF_TYPE_VIDEO_OVERLAY */ - struct v4l2_vbi_format vbi; /* V4L2_BUF_TYPE_VBI_CAPTURE */ - __u8 raw_data[200]; /* user-defined */ + struct v4l2_pix_format pix; // V4L2_BUF_TYPE_VIDEO_CAPTURE + struct v4l2_window win; // V4L2_BUF_TYPE_VIDEO_OVERLAY + struct v4l2_vbi_format vbi; // V4L2_BUF_TYPE_VBI_CAPTURE + struct v4l2_sliced_vbi_format sliced; // V4L2_BUF_TYPE_SLICED_VBI_CAPTURE + __u8 raw_data[200]; // user-defined } fmt; }; @@ -786,7 +1287,32 @@ struct v4l2_streamparm } parm; }; +/* + * A D V A N C E D D E B U G G I N G + * + * NOTE: EXPERIMENTAL API + */ + +/* VIDIOC_DBG_G_REGISTER and VIDIOC_DBG_S_REGISTER */ + +#define V4L2_CHIP_MATCH_HOST 0 /* Match against chip ID on host (0 for the host) */ +#define V4L2_CHIP_MATCH_I2C_DRIVER 1 /* Match against I2C driver ID */ +#define V4L2_CHIP_MATCH_I2C_ADDR 2 /* Match against I2C 7-bit address */ + +struct v4l2_register { + __u32 match_type; /* Match type */ + __u32 match_chip; /* Match this chip, meaning determined by match_type */ + __u64 reg; + __u64 val; +}; +/* VIDIOC_G_CHIP_IDENT */ +struct v4l2_chip_ident { + __u32 match_type; /* Match type */ + __u32 match_chip; /* Match this chip, meaning determined by match_type */ + __u32 ident; /* chip identifier as specified in <media/v4l2-chip-ident.h> */ + __u32 revision; /* chip revision, chip specific */ +}; /* * I O C T L C O D E S F O R V I D E O D E V I C E S @@ -797,30 +1323,26 @@ struct v4l2_streamparm #define VIDIOC_ENUM_FMT _IOWR ('V', 2, struct v4l2_fmtdesc) #define VIDIOC_G_FMT _IOWR ('V', 4, struct v4l2_format) #define VIDIOC_S_FMT _IOWR ('V', 5, struct v4l2_format) -#if 0 -#define VIDIOC_G_COMP _IOR ('V', 6, struct v4l2_compression) -#define VIDIOC_S_COMP _IOW ('V', 7, struct v4l2_compression) -#endif #define VIDIOC_REQBUFS _IOWR ('V', 8, struct v4l2_requestbuffers) #define VIDIOC_QUERYBUF _IOWR ('V', 9, struct v4l2_buffer) #define VIDIOC_G_FBUF _IOR ('V', 10, struct v4l2_framebuffer) #define VIDIOC_S_FBUF _IOW ('V', 11, struct v4l2_framebuffer) -#define VIDIOC_OVERLAY _IOWR ('V', 14, int) +#define VIDIOC_OVERLAY _IOW ('V', 14, int) #define VIDIOC_QBUF _IOWR ('V', 15, struct v4l2_buffer) #define VIDIOC_DQBUF _IOWR ('V', 17, struct v4l2_buffer) #define VIDIOC_STREAMON _IOW ('V', 18, int) #define VIDIOC_STREAMOFF _IOW ('V', 19, int) #define VIDIOC_G_PARM _IOWR ('V', 21, struct v4l2_streamparm) -#define VIDIOC_S_PARM _IOW ('V', 22, struct v4l2_streamparm) +#define VIDIOC_S_PARM _IOWR ('V', 22, struct v4l2_streamparm) #define VIDIOC_G_STD _IOR ('V', 23, v4l2_std_id) #define VIDIOC_S_STD _IOW ('V', 24, v4l2_std_id) #define VIDIOC_ENUMSTD _IOWR ('V', 25, struct v4l2_standard) #define VIDIOC_ENUMINPUT _IOWR ('V', 26, struct v4l2_input) #define VIDIOC_G_CTRL _IOWR ('V', 27, struct v4l2_control) -#define VIDIOC_S_CTRL _IOW ('V', 28, struct v4l2_control) +#define VIDIOC_S_CTRL _IOWR ('V', 28, struct v4l2_control) #define VIDIOC_G_TUNER _IOWR ('V', 29, struct v4l2_tuner) #define VIDIOC_S_TUNER _IOW ('V', 30, struct v4l2_tuner) -#define VIDIOC_G_AUDIO _IOWR ('V', 33, struct v4l2_audio) +#define VIDIOC_G_AUDIO _IOR ('V', 33, struct v4l2_audio) #define VIDIOC_S_AUDIO _IOW ('V', 34, struct v4l2_audio) #define VIDIOC_QUERYCTRL _IOWR ('V', 36, struct v4l2_queryctrl) #define VIDIOC_QUERYMENU _IOWR ('V', 37, struct v4l2_querymenu) @@ -829,49 +1351,54 @@ struct v4l2_streamparm #define VIDIOC_G_OUTPUT _IOR ('V', 46, int) #define VIDIOC_S_OUTPUT _IOWR ('V', 47, int) #define VIDIOC_ENUMOUTPUT _IOWR ('V', 48, struct v4l2_output) -#define VIDIOC_G_AUDOUT _IOWR ('V', 49, struct v4l2_audioout) +#define VIDIOC_G_AUDOUT _IOR ('V', 49, struct v4l2_audioout) #define VIDIOC_S_AUDOUT _IOW ('V', 50, struct v4l2_audioout) #define VIDIOC_G_MODULATOR _IOWR ('V', 54, struct v4l2_modulator) #define VIDIOC_S_MODULATOR _IOW ('V', 55, struct v4l2_modulator) #define VIDIOC_G_FREQUENCY _IOWR ('V', 56, struct v4l2_frequency) #define VIDIOC_S_FREQUENCY _IOW ('V', 57, struct v4l2_frequency) -#define VIDIOC_CROPCAP _IOR ('V', 58, struct v4l2_cropcap) +#define VIDIOC_CROPCAP _IOWR ('V', 58, struct v4l2_cropcap) #define VIDIOC_G_CROP _IOWR ('V', 59, struct v4l2_crop) #define VIDIOC_S_CROP _IOW ('V', 60, struct v4l2_crop) #define VIDIOC_G_JPEGCOMP _IOR ('V', 61, struct v4l2_jpegcompression) #define VIDIOC_S_JPEGCOMP _IOW ('V', 62, struct v4l2_jpegcompression) #define VIDIOC_QUERYSTD _IOR ('V', 63, v4l2_std_id) #define VIDIOC_TRY_FMT _IOWR ('V', 64, struct v4l2_format) +#define VIDIOC_ENUMAUDIO _IOWR ('V', 65, struct v4l2_audio) +#define VIDIOC_ENUMAUDOUT _IOWR ('V', 66, struct v4l2_audioout) +#define VIDIOC_G_PRIORITY _IOR ('V', 67, enum v4l2_priority) +#define VIDIOC_S_PRIORITY _IOW ('V', 68, enum v4l2_priority) +#define VIDIOC_G_SLICED_VBI_CAP _IOWR ('V', 69, struct v4l2_sliced_vbi_cap) +#define VIDIOC_LOG_STATUS _IO ('V', 70) +#define VIDIOC_G_EXT_CTRLS _IOWR ('V', 71, struct v4l2_ext_controls) +#define VIDIOC_S_EXT_CTRLS _IOWR ('V', 72, struct v4l2_ext_controls) +#define VIDIOC_TRY_EXT_CTRLS _IOWR ('V', 73, struct v4l2_ext_controls) +#if 1 +#define VIDIOC_ENUM_FRAMESIZES _IOWR ('V', 74, struct v4l2_frmsizeenum) +#define VIDIOC_ENUM_FRAMEINTERVALS _IOWR ('V', 75, struct v4l2_frmivalenum) +#define VIDIOC_G_ENC_INDEX _IOR ('V', 76, struct v4l2_enc_idx) +#define VIDIOC_ENCODER_CMD _IOWR ('V', 77, struct v4l2_encoder_cmd) +#define VIDIOC_TRY_ENCODER_CMD _IOWR ('V', 78, struct v4l2_encoder_cmd) + +/* Experimental, only implemented if CONFIG_VIDEO_ADV_DEBUG is defined */ +#define VIDIOC_DBG_S_REGISTER _IOW ('V', 79, struct v4l2_register) +#define VIDIOC_DBG_G_REGISTER _IOWR ('V', 80, struct v4l2_register) + +#define VIDIOC_G_CHIP_IDENT _IOWR ('V', 81, struct v4l2_chip_ident) +#endif -#define BASE_VIDIOC_PRIVATE 192 /* 192-255 are private */ - - -#ifdef __KERNEL__ -/* - * - * V 4 L 2 D R I V E R H E L P E R A P I - * - * Some commonly needed functions for drivers (v4l2-common.o module) - */ -#include <linux/fs.h> - -/* Video standard functions */ -extern unsigned int v4l2_video_std_fps(struct v4l2_standard *vs); -extern int v4l2_video_std_construct(struct v4l2_standard *vs, - int id, char *name); - -/* Compatibility layer interface */ -typedef int (*v4l2_kioctl)(struct inode *inode, struct file *file, - unsigned int cmd, void *arg); -int v4l_compat_translate_ioctl(struct inode *inode, struct file *file, - int cmd, void *arg, v4l2_kioctl driver_ioctl); +#ifdef __OLD_VIDIOC_ +/* for compatibility, will go away some day */ +#define VIDIOC_OVERLAY_OLD _IOWR ('V', 14, int) +#define VIDIOC_S_PARM_OLD _IOW ('V', 22, struct v4l2_streamparm) +#define VIDIOC_S_CTRL_OLD _IOW ('V', 28, struct v4l2_control) +#define VIDIOC_G_AUDIO_OLD _IOWR ('V', 33, struct v4l2_audio) +#define VIDIOC_G_AUDOUT_OLD _IOWR ('V', 49, struct v4l2_audioout) +#define VIDIOC_CROPCAP_OLD _IOR ('V', 58, struct v4l2_cropcap) +#endif -/* names for fancy debug output */ -extern char *v4l2_field_names[]; -extern char *v4l2_type_names[]; -extern char *v4l2_ioctl_names[]; +#define BASE_VIDIOC_PRIVATE 192 /* 192-255 are private */ -#endif /* __KERNEL__ */ #endif /* __LINUX_VIDEODEV2_H */ /* diff --git a/src/liba52/xine_a52_decoder.c b/src/liba52/xine_a52_decoder.c index 27480d859..6c4442996 100644 --- a/src/liba52/xine_a52_decoder.c +++ b/src/liba52/xine_a52_decoder.c @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: xine_decoder.c,v 1.81 2007/02/20 00:34:57 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * stuff needed to turn liba52 into a xine decoder plugin */ diff --git a/src/libdts/xine_dts_decoder.c b/src/libdts/xine_dts_decoder.c index 39854600a..6573d5ed0 100644 --- a/src/libdts/xine_dts_decoder.c +++ b/src/libdts/xine_dts_decoder.c @@ -15,13 +15,10 @@ * * You should have received a copy of the GNU General Public 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: xine_decoder.c,v 1.67 2007/02/20 00:34:57 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * 04-09-2001 DTS passtrough (C) Joachim Koenig * 09-12-2001 DTS passthrough inprovements (C) James Courtier-Dutton - * */ #ifndef __sun diff --git a/src/libfaad/xine_faad_decoder.c b/src/libfaad/xine_faad_decoder.c index 3ce1852d3..11a5c5798 100644 --- a/src/libfaad/xine_faad_decoder.c +++ b/src/libfaad/xine_faad_decoder.c @@ -15,10 +15,7 @@ * * You should have received a copy of the GNU General Public 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: xine_decoder.c,v 1.49 2007/02/20 00:34:57 dgp85 Exp $ - * + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ #include <stdlib.h> diff --git a/src/libffmpeg/ff_audio_decoder.c b/src/libffmpeg/ff_audio_decoder.c index 82e19d2d7..5f197bed5 100644 --- a/src/libffmpeg/ff_audio_decoder.c +++ b/src/libffmpeg/ff_audio_decoder.c @@ -15,12 +15,9 @@ * * You should have received a copy of the GNU General Public 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: audio_decoder.c,v 1.33 2007/01/28 18:38:33 miguelfreitas Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * 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 91a7abf2b..0796b3862 100644 --- a/src/libffmpeg/ff_dvaudio_decoder.c +++ b/src/libffmpeg/ff_dvaudio_decoder.c @@ -15,12 +15,9 @@ * * You should have received a copy of the GNU General Public 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: dvaudio_decoder.c,v 1.12 2006/12/04 22:25:13 miguelfreitas Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * 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 fcee29a80..70901d93b 100644 --- a/src/libffmpeg/ff_mpeg_parser.c +++ b/src/libffmpeg/ff_mpeg_parser.c @@ -15,12 +15,10 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * Simple MPEG-ES parser/framer by Thibaut Mattern (tmattern@noos.fr) * based on libmpeg2 decoder. - * - * $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 b307714cc..ea43a6ce4 100644 --- a/src/libffmpeg/ff_mpeg_parser.h +++ b/src/libffmpeg/ff_mpeg_parser.h @@ -15,12 +15,10 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * Simple MPEG-ES parser/framer by Thibaut Mattern (tmattern@noos.fr) * based on libmpeg2 decoder. - * - * $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 83c3f2945..8fc9cc8cb 100644 --- a/src/libffmpeg/ff_video_decoder.c +++ b/src/libffmpeg/ff_video_decoder.c @@ -15,12 +15,9 @@ * * You should have received a copy of the GNU General Public 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: video_decoder.c,v 1.73 2007/03/29 18:41:02 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * xine video decoder plugin using ffmpeg - * */ #ifdef HAVE_CONFIG_H @@ -88,6 +85,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; @@ -425,6 +423,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; } } @@ -1244,9 +1245,10 @@ 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, + (this->bih.biWidth + 15) & ~15, + (this->bih.biHeight + 15) & ~15, this->aspect_ratio, this->output_format, VO_BOTH_FIELDS|this->frame_flags); @@ -1266,8 +1268,8 @@ 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, + (img->width + 15) & ~15, + (img->height + 15) & ~15, this->aspect_ratio, this->output_format, VO_BOTH_FIELDS|this->frame_flags); @@ -1289,10 +1291,6 @@ static void ff_handle_buffer (ff_video_decoder_t *this, buf_element_t *buf) { img->pts = this->pts; this->pts = 0; - /* workaround for demux_mpeg_pes sending fields as frames */ - if (!this->video_step && this->av_frame->interlaced_frame) - video_step_to_use /= 2; - /* workaround for weird 120fps streams */ if( video_step_to_use == 750 ) { /* fallback to the VIDEO_PTS_MODE */ @@ -1304,9 +1302,14 @@ 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; - img->crop_bottom = this->crop_bottom; - + /* 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 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); if(free_img) @@ -1314,11 +1317,14 @@ static void ff_handle_buffer (ff_video_decoder_t *this, buf_element_t *buf) { } } - if (!got_one_picture) { - /* skipped frame, output a bad frame (of size 1x1 when size still uninitialized) */ + /* 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->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) ? 1 : this->bih.biWidth, - (this->bih.biHeight <= 0) ? 1 : 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|this->frame_flags); @@ -1327,10 +1333,17 @@ static void ff_handle_buffer (ff_video_decoder_t *this, buf_element_t *buf) { this->pts = 0; img->duration = video_step_to_use; + + /* 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 6f85cc1fa..d0175184f 100644 --- a/src/libffmpeg/ffmpeg_decoder.c +++ b/src/libffmpeg/ffmpeg_decoder.c @@ -15,12 +15,9 @@ * * You should have received a copy of the GNU General Public 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: xine_decoder.c,v 1.173 2007/01/13 21:19:52 miguelfreitas Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * xine decoder plugin using ffmpeg - * */ #ifdef HAVE_CONFIG_H diff --git a/src/libffmpeg/ffmpeg_decoder.h b/src/libffmpeg/ffmpeg_decoder.h index 879ee3175..14788cf29 100644 --- a/src/libffmpeg/ffmpeg_decoder.h +++ b/src/libffmpeg/ffmpeg_decoder.h @@ -15,10 +15,7 @@ * * You should have received a copy of the GNU General Public 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: xine_decoder.h,v 1.7 2006/08/02 07:15:27 tmmm Exp $ - * + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ #ifndef HAVE_XINE_DECODER_H diff --git a/src/libffmpeg/ffmpeg_encoder.c b/src/libffmpeg/ffmpeg_encoder.c index e234b4ddc..35c47db28 100644 --- a/src/libffmpeg/ffmpeg_encoder.c +++ b/src/libffmpeg/ffmpeg_encoder.c @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: xine_encoder.c,v 1.25 2006/07/10 22:08:29 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ /* mpeg encoders for the dxr3 video out plugin. */ diff --git a/src/libmad/xine_mad_decoder.c b/src/libmad/xine_mad_decoder.c index e8801c37a..2f6d7cfe3 100644 --- a/src/libmad/xine_mad_decoder.c +++ b/src/libmad/xine_mad_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.57 2006/07/10 22:08:29 dgp85 Exp $ - * * stuff needed to turn libmad into a xine decoder plugin */ diff --git a/src/libmpeg2/xine_mpeg2_decoder.c b/src/libmpeg2/xine_mpeg2_decoder.c index d26b5b24d..4c4cc8654 100644 --- a/src/libmpeg2/xine_mpeg2_decoder.c +++ b/src/libmpeg2/xine_mpeg2_decoder.c @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: xine_decoder.c,v 1.59 2006/07/10 22:08:29 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * 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/libmusepack/xine_musepack_decoder.c b/src/libmusepack/xine_musepack_decoder.c index 44f2444d6..7a2d30a06 100644 --- a/src/libmusepack/xine_musepack_decoder.c +++ b/src/libmusepack/xine_musepack_decoder.c @@ -15,15 +15,13 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * xine interface to libmusepack by James Stembridge <jstembridge@gmail.com> * * TODO: * 32bit float output * Seeking?? - * - * $Id: xine_decoder.c,v 1.10 2007/01/19 02:35:36 dgp85 Exp $ */ #include <stdio.h> diff --git a/src/libreal/real_common.c b/src/libreal/real_common.c index 371ffd246..fcd0fac8f 100644 --- a/src/libreal/real_common.c +++ b/src/libreal/real_common.c @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: real_common.c,v 1.12 2007/03/17 15:45:41 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * Common function for the thin layer to use Real binary-only codecs in xine */ @@ -75,32 +73,63 @@ void _x_real_codecs_init(xine_t *const xine) { #ifdef REAL_CODEC_PATH const char *const default_real_codecs_path = REAL_CODEC_PATH; #else - const char *default_real_codecs_path = ""; - struct stat s; - -#define try_real_path(path) \ - if (!stat (path "/drvc.so", &s)) \ - default_real_codecs_path = path; -#define try_real_subpath(path) \ - try_real_path("/usr/" path) \ - else try_real_path("/usr/local/" path) \ - else try_real_path("/opt/" path) - - /* The priority is for the first found */ - try_real_subpath("lib/win32") - else try_real_subpath("lib/codecs") - else try_real_subpath("lib64/real") - else try_real_subpath("lib/real") - else try_real_subpath("lib/RealPlayer10GOLD/codecs") - else try_real_subpath("lib64/RealPlayer10/codecs") - else try_real_subpath("lib/RealPlayer10/codecs") - else try_real_subpath("lib64/RealPlayer9/users/Real/Codecs") - else try_real_subpath("lib/RealPlayer9/users/Real/Codecs") - else try_real_subpath("lib/RealPlayer8/Codecs") - else try_real_subpath("RealPlayer8/Codecs"); - -#undef try_real_path -#undef try_real_subpath + char default_real_codecs_path[256]; + + default_real_codecs_path[0] = 0; + +#define UL64 0x05 /* /usr/{,local/}lib64 */ +#define UL 0x0A /* /usr/{,local/}lib */ +#define O 0x10 /* /opt */ +#define OL64 0x20 /* /opt/lib64 */ +#define OL 0x40 /* /opt/lib */ + + static const char *const prefix[] = { + "/usr/lib64", "/usr/local/lib64", + "/usr/lib", "/usr/local/lib", + "/opt", "/opt/lib64", "/opt/lib", + }; + + static const struct { + int prefix; + const char *path; + } paths[] = { + { O | UL, "win32" }, + { O | UL, "codecs" }, + { O | UL | UL64, "real" }, + { O, "real/RealPlayer/codecs" }, + { OL | OL64 | UL | UL64, "RealPlayer10GOLD/codecs" }, + { OL | OL64 | UL | UL64, "RealPlayer10/codecs" }, + { OL | OL64 | UL | UL64, "RealPlayer9/users/Real/Codecs" }, + { O | OL | UL, "RealPlayer8/Codecs" }, + {} + }; + + int i; + for (i = 0; paths[i].prefix; ++i) + { + int p; + for (p = 0; p < sizeof (prefix) / sizeof (prefix[0]); ++p) + { + if (paths[i].prefix & (1 << p)) + { + void *handle; + snprintf (default_real_codecs_path, sizeof (default_real_codecs_path), "%s/%s/drvc.so", prefix[p], paths[i].path); + handle = dlopen (default_real_codecs_path, RTLD_NOW); + if (handle) + { + dlclose (handle); + snprintf (default_real_codecs_path, sizeof (default_real_codecs_path), "%s/%s", prefix[p], paths[i].path); + goto found; + } + } + } + } + + /* if this is reached, no valid path was found */ + default_real_codecs_path[0] = 0; + + found:; + #endif real_codecs_path = diff --git a/src/libreal/real_common.h b/src/libreal/real_common.h index 232bf2a4d..1e3d8c264 100644 --- a/src/libreal/real_common.h +++ b/src/libreal/real_common.h @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: real_common.h,v 1.7 2007/03/17 15:45:41 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * 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 24fc5a949..1b21de2d0 100644 --- a/src/libreal/xine_real_audio_decoder.c +++ b/src/libreal/xine_real_audio_decoder.c @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: audio_decoder.c,v 1.59 2007/03/17 15:45:41 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * thin layer to use real binary-only codecs in xine * diff --git a/src/libreal/xine_real_video_decoder.c b/src/libreal/xine_real_video_decoder.c index 48fbc6271..d68c7390e 100644 --- a/src/libreal/xine_real_video_decoder.c +++ b/src/libreal/xine_real_video_decoder.c @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: xine_decoder.c,v 1.93 2007/03/17 15:45:41 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * thin layer to use real binary-only codecs in xine * diff --git a/src/libspucc/cc_decoder.c b/src/libspucc/cc_decoder.c index dc380c8de..8d666e847 100644 --- a/src/libspucc/cc_decoder.c +++ b/src/libspucc/cc_decoder.c @@ -18,9 +18,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - * - * $Id: cc_decoder.c,v 1.28 2007/02/20 00:56:36 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * stuff needed to provide closed captioning decoding and display * diff --git a/src/libspucc/cc_decoder.h b/src/libspucc/cc_decoder.h index 0e7fb69a5..8698189a6 100644 --- a/src/libspucc/cc_decoder.h +++ b/src/libspucc/cc_decoder.h @@ -18,9 +18,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - * - * $Id: cc_decoder.h,v 1.8 2007/02/20 00:56:36 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * stuff needed to provide closed captioning decoding and display * diff --git a/src/libspucc/xine_cc_decoder.c b/src/libspucc/xine_cc_decoder.c index 1a32274f6..9cdb4c4ea 100644 --- a/src/libspucc/xine_cc_decoder.c +++ b/src/libspucc/xine_cc_decoder.c @@ -15,12 +15,9 @@ * * You should have received a copy of the GNU General Public 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: xine_decoder.c,v 1.34 2006/07/10 22:08:30 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * 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 13cb6c066..b684d21cb 100644 --- a/src/libspucmml/xine_cmml_decoder.c +++ b/src/libspucmml/xine_cmml_decoder.c @@ -15,10 +15,7 @@ * * You should have received a copy of the GNU General Public 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: xine_decoder.c,v 1.8 2006/07/10 22:08:30 dgp85 Exp $ - * + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ #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 91f4f8ab6..8d92146f0 100644 --- a/src/libspudec/spu.h +++ b/src/libspudec/spu.h @@ -17,12 +17,9 @@ * * You should have received a copy of the GNU General Public 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: spu.h,v 1.27 2004/07/14 01:18:48 miguelfreitas Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * 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 c98d9e4dd..0ab91d906 100644 --- a/src/libspudec/xine_spu_decoder.c +++ b/src/libspudec/xine_spu_decoder.c @@ -17,9 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - * - * $Id: xine_decoder.c,v 1.116 2006/07/10 22:08:30 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * 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 7fe972be6..0f4716564 100644 --- a/src/libspudvb/xine_spudvb_decoder.c +++ b/src/libspudvb/xine_spudvb_decoder.c @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: xine_decoder.c,v 1.20 2006/07/10 22:08:30 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * DVB Subtitle decoder (ETS 300 743) * (c) 2004 Mike Lampard <mlampard@users.sourceforge.net> diff --git a/src/libsputext/demux_sputext.c b/src/libsputext/demux_sputext.c index c17dde6c8..502ef6580 100644 --- a/src/libsputext/demux_sputext.c +++ b/src/libsputext/demux_sputext.c @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: demux_sputext.c,v 1.53 2007/01/19 01:05:25 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * code based on old libsputext/xine_decoder.c * diff --git a/src/libsputext/xine_sputext_decoder.c b/src/libsputext/xine_sputext_decoder.c index 5d9a3c116..ed09380d4 100644 --- a/src/libsputext/xine_sputext_decoder.c +++ b/src/libsputext/xine_sputext_decoder.c @@ -15,10 +15,7 @@ * * You should have received a copy of the GNU General Public 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: xine_decoder.c,v 1.99 2007/02/20 01:04:07 dgp85 Exp $ - * + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ #include <stdlib.h> diff --git a/src/libw32dll/qt_decoder.c b/src/libw32dll/qt_decoder.c index da2883f0f..3053b2b68 100644 --- a/src/libw32dll/qt_decoder.c +++ b/src/libw32dll/qt_decoder.c @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: qt_decoder.c,v 1.45 2006/07/10 22:08:43 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * quicktime video/audio decoder plugin, using win32 dlls * most of this code comes directly from MPlayer diff --git a/src/libw32dll/w32codec.c b/src/libw32dll/w32codec.c index 02cad2d1f..88790ebc7 100644 --- a/src/libw32dll/w32codec.c +++ b/src/libw32dll/w32codec.c @@ -15,14 +15,11 @@ * * You should have received a copy of the GNU General Public 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: w32codec.c,v 1.155 2006/07/10 22:08:43 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * 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 609ed7c90..1f02ba764 100644 --- a/src/libw32dll/w32codec.h +++ b/src/libw32dll/w32codec.h @@ -15,12 +15,9 @@ * * You should have received a copy of the GNU General Public 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: w32codec.h,v 1.3 2001/06/10 00:21:53 guenter Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * 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 33beb3104..5ab4fa1f6 100644 --- a/src/libxineadec/fooaudio.c +++ b/src/libxineadec/fooaudio.c @@ -15,13 +15,11 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * fooaudio.c: This is a reference audio decoder for the xine multimedia * player. It really works too! It will output a continuous sine wave in * 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 700d1ee4d..23c0d2104 100644 --- a/src/libxineadec/gsm610.c +++ b/src/libxineadec/gsm610.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * GSM 6.10 Audio Decoder * This decoder is based on the GSM 6.10 codec library found at: @@ -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/nsf.c b/src/libxineadec/nsf.c index 31d3b36e8..bdf523f1d 100644 --- a/src/libxineadec/nsf.c +++ b/src/libxineadec/nsf.c @@ -15,12 +15,10 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * NSF Audio "Decoder" using the Nosefart NSF engine by Matt Conte * http://www.baisoku.org/ - * - * $Id: nsf.c,v 1.13 2006/09/25 23:56:31 dgp85 Exp $ */ #include <stdio.h> diff --git a/src/libxineadec/xine_lpcm_decoder.c b/src/libxineadec/xine_lpcm_decoder.c index de9585849..8d8f23a05 100644 --- a/src/libxineadec/xine_lpcm_decoder.c +++ b/src/libxineadec/xine_lpcm_decoder.c @@ -15,13 +15,10 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * - * $Id: xine_decoder.c,v 1.62 2007/03/17 20:59:36 dgp85 Exp $ - * * 31-8-2001 Added LPCM rate sensing. * (c) 2001 James Courtier-Dutton James@superbug.demon.co.uk - * */ #ifndef __sun #define _XOPEN_SOURCE 500 diff --git a/src/libxineadec/xine_speex_decoder.c b/src/libxineadec/xine_speex_decoder.c index e99585fe5..aa8234385 100644 --- a/src/libxineadec/xine_speex_decoder.c +++ b/src/libxineadec/xine_speex_decoder.c @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: xine_decoder.c,v 1.22 2007/01/19 01:48:05 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * (ogg/)speex audio decoder plugin (libspeex wrapper) for xine */ diff --git a/src/libxineadec/xine_vorbis_decoder.c b/src/libxineadec/xine_vorbis_decoder.c index c7b1e5761..d437c1e4b 100644 --- a/src/libxineadec/xine_vorbis_decoder.c +++ b/src/libxineadec/xine_vorbis_decoder.c @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: xine_decoder.c,v 1.48 2006/12/04 13:59:38 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * (ogg/)vorbis audio decoder plugin (libvorbis wrapper) for xine */ diff --git a/src/libxinevdec/bitplane.c b/src/libxinevdec/bitplane.c index f9a3aa8e0..bf868ad2a 100644 --- a/src/libxinevdec/bitplane.c +++ b/src/libxinevdec/bitplane.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * Bitplane "Decoder" by Manfred Tremmel (Manfred.Tremmel@iiv.de) * Converts Amiga typical bitplane pictures to a YUV2 map @@ -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 385784d5d..98e0ebc0b 100644 --- a/src/libxinevdec/foovideo.c +++ b/src/libxinevdec/foovideo.c @@ -15,15 +15,13 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * foovideo.c: This is a reference video decoder for the xine multimedia * player. It really works too! It will output frames of packed YUY2 data * 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 f5c2973fd..b5acdfa42 100644 --- a/src/libxinevdec/gdkpixbuf.c +++ b/src/libxinevdec/gdkpixbuf.c @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: gdkpixbuf.c,v 1.7 2006/08/05 13:31:13 hadess Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * a gdk-pixbuf-based image video decoder */ diff --git a/src/libxinevdec/image.c b/src/libxinevdec/image.c index 4f33e91e6..a338e3cab 100644 --- a/src/libxinevdec/image.c +++ b/src/libxinevdec/image.c @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: image.c,v 1.21 2006/10/16 22:18:24 valtri Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * a image video decoder */ diff --git a/src/libxinevdec/rgb.c b/src/libxinevdec/rgb.c index aef58be97..0e7be4c18 100644 --- a/src/libxinevdec/rgb.c +++ b/src/libxinevdec/rgb.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * Raw RGB "Decoder" by Mike Melanson (melanson@pcisys.net) * Actually, this decoder just converts a raw RGB image to a YUY2 map @@ -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/xine_theora_decoder.c b/src/libxinevdec/xine_theora_decoder.c index ea968c415..c71ce7559 100644 --- a/src/libxinevdec/xine_theora_decoder.c +++ b/src/libxinevdec/xine_theora_decoder.c @@ -15,12 +15,9 @@ * * You should have received a copy of the GNU General Public 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: xine_decoder.c,v 1.26 2006/07/10 22:08:30 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * xine decoder plugin using libtheora - * */ #ifdef HAVE_CONFIG_H diff --git a/src/libxinevdec/yuv.c b/src/libxinevdec/yuv.c index 8314765d9..2b8657685 100644 --- a/src/libxinevdec/yuv.c +++ b/src/libxinevdec/yuv.c @@ -15,13 +15,11 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * YUV "Decoder" by Mike Melanson (melanson@pcisys.net) * Actually, this decoder just reorganizes chunks of raw YUV data in such * 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 3d56a793b..8200db51b 100644 --- a/src/post/audio/audio_filters.c +++ b/src/post/audio/audio_filters.c @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: audio_filters.c,v 1.7 2006/07/10 22:08:44 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * catalog for audio filter plugins */ diff --git a/src/post/audio/audio_filters.h b/src/post/audio/audio_filters.h index 111367006..6c064945a 100644 --- a/src/post/audio/audio_filters.h +++ b/src/post/audio/audio_filters.h @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: audio_filters.h,v 1.3 2006/02/05 20:38:37 miguelfreitas Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * catalog for audio filter plugins */ diff --git a/src/post/audio/stretch.c b/src/post/audio/stretch.c index 33fd4b7ce..5aa7a0617 100644 --- a/src/post/audio/stretch.c +++ b/src/post/audio/stretch.c @@ -15,12 +15,9 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * Time stretch by a given factor, optionally preserving pitch - * - * $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 bc8cb8025..e1b2afbe3 100644 --- a/src/post/audio/upmix.c +++ b/src/post/audio/upmix.c @@ -15,16 +15,13 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * Upmix audio filter for xine. * (c) 2004 James Courtier-Dutton (James@superbug.demon.co.uk) * 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 5a8ea9abb..195831123 100644 --- a/src/post/audio/upmix_mono.c +++ b/src/post/audio/upmix_mono.c @@ -15,15 +15,12 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * Upmix audio filter for xine. * (c) 2004 James Courtier-Dutton (James@superbug.demon.co.uk) * 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 9278db6a9..783c1e26d 100644 --- a/src/post/audio/volnorm.c +++ b/src/post/audio/volnorm.c @@ -15,14 +15,11 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * Volume normalization audio filter for xine. Ported by Jason Tackaberry * from MPlayer's af_volnorm, which is copyright 2004 by Alex Beregszaszi * & 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/deinterlace.c b/src/post/deinterlace/deinterlace.c index 7928c1a64..8e4a3bb00 100644 --- a/src/post/deinterlace/deinterlace.c +++ b/src/post/deinterlace/deinterlace.c @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA. */ #ifdef HAVE_CONFIG_H diff --git a/src/post/deinterlace/deinterlace.h b/src/post/deinterlace/deinterlace.h index 0e4ab49b5..e3e614834 100644 --- a/src/post/deinterlace/deinterlace.h +++ b/src/post/deinterlace/deinterlace.h @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA. */ #ifndef DEINTERLACE_H_INCLUDED diff --git a/src/post/deinterlace/plugins/double.c b/src/post/deinterlace/plugins/double.c index 5cc13f5e9..35c5417a3 100644 --- a/src/post/deinterlace/plugins/double.c +++ b/src/post/deinterlace/plugins/double.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA. */ #ifdef HAVE_CONFIG_H diff --git a/src/post/deinterlace/plugins/greedy2frame.c b/src/post/deinterlace/plugins/greedy2frame.c index b2f929c8a..57e3228ac 100644 --- a/src/post/deinterlace/plugins/greedy2frame.c +++ b/src/post/deinterlace/plugins/greedy2frame.c @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA. */ #ifdef HAVE_CONFIG_H diff --git a/src/post/deinterlace/plugins/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/plugins/plugins.h b/src/post/deinterlace/plugins/plugins.h index b42c0cbc8..949e0e4d1 100644 --- a/src/post/deinterlace/plugins/plugins.h +++ b/src/post/deinterlace/plugins/plugins.h @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA. */ #ifndef TVTIME_PLUGINS_H_INCLUDED diff --git a/src/post/deinterlace/pulldown.c b/src/post/deinterlace/pulldown.c index cb263ccfb..4f6247444 100644 --- a/src/post/deinterlace/pulldown.c +++ b/src/post/deinterlace/pulldown.c @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA. */ #ifdef HAVE_CONFIG_H diff --git a/src/post/deinterlace/pulldown.h b/src/post/deinterlace/pulldown.h index 13868f30f..0dc9781cb 100644 --- a/src/post/deinterlace/pulldown.h +++ b/src/post/deinterlace/pulldown.h @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA. */ #ifndef PULLDOWN_H_INCLUDED diff --git a/src/post/deinterlace/speedtools.h b/src/post/deinterlace/speedtools.h index 059d8a5f3..94ab1918d 100644 --- a/src/post/deinterlace/speedtools.h +++ b/src/post/deinterlace/speedtools.h @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA. */ #ifndef SPEEDTOOLS_H_INCLUDED diff --git a/src/post/deinterlace/speedy.c b/src/post/deinterlace/speedy.c index 0cf07258b..a980780d7 100644 --- a/src/post/deinterlace/speedy.c +++ b/src/post/deinterlace/speedy.c @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA. */ /** @@ -1912,7 +1912,7 @@ static void a8_subpix_blit_scanline_c( uint8_t *output, uint8_t *input, * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA. */ #define FP_BITS 18 diff --git a/src/post/deinterlace/speedy.h b/src/post/deinterlace/speedy.h index 7bc1a6535..b4ad56393 100644 --- a/src/post/deinterlace/speedy.h +++ b/src/post/deinterlace/speedy.h @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA. */ #ifndef SPEEDY_H_INCLUDED diff --git a/src/post/deinterlace/tvtime.c b/src/post/deinterlace/tvtime.c index 0c13329ff..eff43d5e8 100644 --- a/src/post/deinterlace/tvtime.c +++ b/src/post/deinterlace/tvtime.c @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA. */ #ifdef HAVE_CONFIG_H diff --git a/src/post/deinterlace/tvtime.h b/src/post/deinterlace/tvtime.h index 1cba7b1a9..8e4c5abc2 100644 --- a/src/post/deinterlace/tvtime.h +++ b/src/post/deinterlace/tvtime.h @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA. */ #ifndef TVTIME_H_INCLUDED diff --git a/src/post/deinterlace/xine_plugin.c b/src/post/deinterlace/xine_plugin.c index f0f8879bc..99bd597f6 100644 --- a/src/post/deinterlace/xine_plugin.c +++ b/src/post/deinterlace/xine_plugin.c @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: xine_plugin.c,v 1.52 2006/07/12 21:08:46 dsalt Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * 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 500ae34ea..351c997ba 100644 --- a/src/post/goom/xine_goom.c +++ b/src/post/goom/xine_goom.c @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: xine_goom.c,v 1.65 2007/02/20 00:58:51 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * GOOM post plugin. * diff --git a/src/post/mosaico/mosaico.c b/src/post/mosaico/mosaico.c index 40173bd5d..50b1cfcdf 100644 --- a/src/post/mosaico/mosaico.c +++ b/src/post/mosaico/mosaico.c @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: mosaico.c,v 1.28 2006/07/10 22:08:44 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ /* diff --git a/src/post/mosaico/switch.c b/src/post/mosaico/switch.c index 38bd98a66..8fec5ee77 100644 --- a/src/post/mosaico/switch.c +++ b/src/post/mosaico/switch.c @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: switch.c,v 1.18 2006/07/10 22:08:44 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ /* diff --git a/src/post/planar/boxblur.c b/src/post/planar/boxblur.c index 1644d2046..b7a6f524f 100644 --- a/src/post/planar/boxblur.c +++ b/src/post/planar/boxblur.c @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: boxblur.c,v 1.14 2006/01/27 07:46:14 tmattern Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * 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 370ab4e23..fb3c1102b 100644 --- a/src/post/planar/denoise3d.c +++ b/src/post/planar/denoise3d.c @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: denoise3d.c,v 1.14 2006/01/27 07:46:14 tmattern Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * 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 8c7b00e4b..b2cf6e50f 100644 --- a/src/post/planar/eq.c +++ b/src/post/planar/eq.c @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: eq.c,v 1.15 2007/03/22 23:32:05 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * 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 38f9117db..6b277c347 100644 --- a/src/post/planar/eq2.c +++ b/src/post/planar/eq2.c @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: eq2.c,v 1.18 2007/03/22 23:32:05 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * mplayer's eq2 (soft video equalizer) * Software equalizer (brightness, contrast, gamma, saturation) diff --git a/src/post/planar/expand.c b/src/post/planar/expand.c index cf288921f..67d449153 100644 --- a/src/post/planar/expand.c +++ b/src/post/planar/expand.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * $Id: * diff --git a/src/post/planar/fill.c b/src/post/planar/fill.c index 1fdc2ad8b..32a9d5dfb 100644 --- a/src/post/planar/fill.c +++ b/src/post/planar/fill.c @@ -15,14 +15,11 @@ * * You should have received a copy of the GNU General Public 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: fill.c,v 1.1 2005/07/18 18:02:51 jstembridge Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * 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 77f7c54d1..1aa5c2a2e 100644 --- a/src/post/planar/invert.c +++ b/src/post/planar/invert.c @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: invert.c,v 1.20 2004/04/17 19:54:32 mroi Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ /* diff --git a/src/post/planar/noise.c b/src/post/planar/noise.c index a5bf03039..8c04f2e72 100644 --- a/src/post/planar/noise.c +++ b/src/post/planar/noise.c @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: noise.c,v 1.4 2007/03/22 23:32:05 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * 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 5f4363e2f..5907d58e5 100644 --- a/src/post/planar/planar.c +++ b/src/post/planar/planar.c @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: planar.c,v 1.13 2006/07/10 22:08:44 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * catalog for planar post plugins */ diff --git a/src/post/planar/pp.c b/src/post/planar/pp.c index c66e40459..e13119311 100644 --- a/src/post/planar/pp.c +++ b/src/post/planar/pp.c @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: pp.c,v 1.9 2006/01/27 07:46:14 tmattern Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * plugin for ffmpeg libpostprocess */ diff --git a/src/post/planar/unsharp.c b/src/post/planar/unsharp.c index 161104a64..b9b791a8e 100644 --- a/src/post/planar/unsharp.c +++ b/src/post/planar/unsharp.c @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: unsharp.c,v 1.18 2006/01/27 07:46:14 tmattern Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * mplayer's unsharp * Copyright (C) 2002 Rémi Guyomarch <rguyom@pobox.com> diff --git a/src/post/visualizations/fft.c b/src/post/visualizations/fft.c index fba3cb8ad..e9a99911a 100644 --- a/src/post/visualizations/fft.c +++ b/src/post/visualizations/fft.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * FFT code by Steve Haehnichen, originally licensed under GPL v1 * modified by Thibaut Mattern (tmattern@noos.fr) to remove global vars diff --git a/src/post/visualizations/fft.h b/src/post/visualizations/fft.h index 1ab501be5..dff3cd7e8 100644 --- a/src/post/visualizations/fft.h +++ b/src/post/visualizations/fft.h @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * */ #ifndef FFT_H diff --git a/src/post/visualizations/fftgraph.c b/src/post/visualizations/fftgraph.c index a73e8eeee..5068bd37a 100644 --- a/src/post/visualizations/fftgraph.c +++ b/src/post/visualizations/fftgraph.c @@ -15,13 +15,10 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * FftGraph Visualization Post Plugin For xine * by Thibaut Mattern (tmattern@noos.fr) - * - * $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 364421bd1..ba34437f5 100644 --- a/src/post/visualizations/fftscope.c +++ b/src/post/visualizations/fftscope.c @@ -15,15 +15,12 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * Fast Fourier Transform Visualization Post Plugin For xine * by Mike Melanson (melanson@pcisys.net) * * 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 02ebea7da..21854afc6 100644 --- a/src/post/visualizations/fooviz.c +++ b/src/post/visualizations/fooviz.c @@ -15,16 +15,13 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * Reference Visualization Post Plugin For xine * by Mike Melanson (melanson@pcisys.net) * 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 2c3e7dd45..a435604d4 100644 --- a/src/post/visualizations/oscope.c +++ b/src/post/visualizations/oscope.c @@ -15,13 +15,10 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * Basic Oscilloscope Visualization Post Plugin For xine * by Mike Melanson (melanson@pcisys.net) - * - * $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 befd8ca4c..a26f0bd5b 100644 --- a/src/post/visualizations/visualizations.c +++ b/src/post/visualizations/visualizations.c @@ -15,11 +15,9 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * This file contains plugin entries for several visualization post plugins. - * - * $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 967d98c35..39d02e1cb 100644 --- a/src/post/visualizations/visualizations.h +++ b/src/post/visualizations/visualizations.h @@ -15,11 +15,9 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * This file contains plugin entries for several visualization post plugins. - * - * $Id: visualizations.h,v 1.1 2003/10/30 22:40:53 mroi Exp $ */ #include "xine_internal.h" diff --git a/src/video_out/deinterlace.c b/src/video_out/deinterlace.c index 1fda3d733..8ba161ebb 100644 --- a/src/video_out/deinterlace.c +++ b/src/video_out/deinterlace.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * Deinterlace routines by Miguel Freitas * based of DScaler project sources (deinterlace.sourceforge.net) diff --git a/src/video_out/deinterlace.h b/src/video_out/deinterlace.h index a9904b42a..2ebbf53d9 100644 --- a/src/video_out/deinterlace.h +++ b/src/video_out/deinterlace.h @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * Deinterlace routines by Miguel Freitas * based of DScaler project sources (deinterlace.sourceforge.net) diff --git a/src/video_out/macosx/XineOpenGLView.h b/src/video_out/macosx/XineOpenGLView.h index b63738047..69e2905b0 100644 --- a/src/video_out/macosx/XineOpenGLView.h +++ b/src/video_out/macosx/XineOpenGLView.h @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * */ diff --git a/src/video_out/macosx/XineOpenGLView.m b/src/video_out/macosx/XineOpenGLView.m index c29f95dc7..a9ffee00f 100644 --- a/src/video_out/macosx/XineOpenGLView.m +++ b/src/video_out/macosx/XineOpenGLView.m @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * */ diff --git a/src/video_out/macosx/XineVideoWindow.h b/src/video_out/macosx/XineVideoWindow.h index 2ff617242..c8f9b5940 100644 --- a/src/video_out/macosx/XineVideoWindow.h +++ b/src/video_out/macosx/XineVideoWindow.h @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * */ diff --git a/src/video_out/macosx/XineVideoWindow.m b/src/video_out/macosx/XineVideoWindow.m index 0dd2caa28..f3a9400d9 100644 --- a/src/video_out/macosx/XineVideoWindow.m +++ b/src/video_out/macosx/XineVideoWindow.m @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * Written by Daniel Mack <xine@zonque.org> * diff --git a/src/video_out/macosx/video_window.h b/src/video_out/macosx/video_window.h index 07405b8fe..b46ac43fe 100644 --- a/src/video_out/macosx/video_window.h +++ b/src/video_out/macosx/video_window.h @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * Written by Daniel Mack <xine@zonque.org> * diff --git a/src/video_out/video_out_aa.c b/src/video_out/video_out_aa.c index f5fd8ef38..012db9665 100644 --- a/src/video_out/video_out_aa.c +++ b/src/video_out/video_out_aa.c @@ -15,12 +15,9 @@ * * You should have received a copy of the GNU General Public 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: video_out_aa.c,v 1.49 2006/07/10 22:08:44 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * 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 ad482af8d..866eabcd8 100644 --- a/src/video_out/video_out_caca.c +++ b/src/video_out/video_out_caca.c @@ -15,12 +15,9 @@ * * You should have received a copy of the GNU General Public 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: video_out_caca.c,v 1.9 2006/09/14 00:44:19 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * 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 ee52b7817..3e30f664d 100644 --- a/src/video_out/video_out_directfb.c +++ b/src/video_out/video_out_directfb.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * * DirectFB based output plugin by Claudio Ciccani <klan@directfb.org> diff --git a/src/video_out/video_out_directfb_fb.c b/src/video_out/video_out_directfb_fb.c index 182a56941..b904407c3 100644 --- a/src/video_out/video_out_directfb_fb.c +++ b/src/video_out/video_out_directfb_fb.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * * DirectFB output plugin (console version wrapper) diff --git a/src/video_out/video_out_directfb_x.c b/src/video_out/video_out_directfb_x.c index b3a1f53b7..48f709eae 100644 --- a/src/video_out/video_out_directfb_x.c +++ b/src/video_out/video_out_directfb_x.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * * DirectFB output plugin (X version wrapper) diff --git a/src/video_out/video_out_directx.c b/src/video_out/video_out_directx.c index 7c3e5a78c..11ee709e1 100644 --- a/src/video_out/video_out_directx.c +++ b/src/video_out/video_out_directx.c @@ -15,12 +15,10 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * video_out_directx.c, direct draw video output plugin for xine * by Matthew Grooms <elon@altavista.com> - * - * $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 3c53adf4d..78d23cd91 100644 --- a/src/video_out/video_out_fb.c +++ b/src/video_out/video_out_fb.c @@ -15,10 +15,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * - * $Id: video_out_fb.c,v 1.49 2006/12/19 19:10:51 dsalt Exp $ - * * video_out_fb.c, frame buffer xine driver by Miguel Freitas * * Contributors: 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 8f1ee3968..5f2424a60 100644 --- a/src/video_out/video_out_none.c +++ b/src/video_out/video_out_none.c @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: video_out_none.c,v 1.27 2006/07/10 22:08:44 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * Was originally part of toxine frontend. * ...but has now been adapted to xine coding style standards ;) diff --git a/src/video_out/video_out_opengl.c b/src/video_out/video_out_opengl.c index a027f2e06..54696f452 100644 --- a/src/video_out/video_out_opengl.c +++ b/src/video_out/video_out_opengl.c @@ -15,15 +15,12 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * - * $Id: video_out_opengl.c,v 1.59 2006/07/10 22:08:44 dgp85 Exp $ - * * 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 2c18a3d77..d903efc89 100644 --- a/src/video_out/video_out_pgx32.c +++ b/src/video_out/video_out_pgx32.c @@ -15,15 +15,12 @@ * * You should have received a copy of the GNU General Public 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: video_out_pgx32.c,v 1.17 2006/07/10 22:08:44 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * 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 1474c4354..4abb794d7 100644 --- a/src/video_out/video_out_pgx64.c +++ b/src/video_out/video_out_pgx64.c @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: video_out_pgx64.c,v 1.78 2006/07/10 22:08:44 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * video_out_pgx64.c, Sun XVR100/PGX64/PGX24 output plugin for xine * @@ -25,7 +23,6 @@ * 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 77496b59b..f4f645e8c 100644 --- a/src/video_out/video_out_sdl.c +++ b/src/video_out/video_out_sdl.c @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: video_out_sdl.c,v 1.48 2006/07/10 22:08:44 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * video_out_sdl.c, Simple DirectMedia Layer * diff --git a/src/video_out/video_out_stk.c b/src/video_out/video_out_stk.c index 2e5708874..dfc4ae385 100644 --- a/src/video_out/video_out_stk.c +++ b/src/video_out/video_out_stk.c @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: video_out_stk.c,v 1.19 2006/07/10 22:08:44 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * 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 f03d0ea97..86be3422e 100644 --- a/src/video_out/video_out_syncfb.c +++ b/src/video_out/video_out_syncfb.c @@ -15,10 +15,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * - * $Id: video_out_syncfb.c,v 1.108 2006/12/19 19:10:51 dsalt Exp $ - * * 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 b90a162ca..21e361d93 100644 --- a/src/video_out/video_out_vidix.c +++ b/src/video_out/video_out_vidix.c @@ -15,10 +15,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * - * $Id: video_out_vidix.c,v 1.75 2006/12/19 19:10:51 dsalt Exp $ - * * 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 5b4eb1fa3..725889d62 100644 --- a/src/video_out/video_out_xcbshm.c +++ b/src/video_out/video_out_xcbshm.c @@ -15,10 +15,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * - * $Id: video_out_xcbshm.c,v 1.3 2007/03/25 23:13:53 dgp85 Exp $ - * * 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 81c78a71f..cb582baab 100644 --- a/src/video_out/video_out_xcbxv.c +++ b/src/video_out/video_out_xcbxv.c @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: video_out_xcbxv.c,v 1.6 2007/03/29 18:58:21 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * video_out_xcbxv.c, X11 video extension interface for xine * diff --git a/src/video_out/video_out_xshm.c b/src/video_out/video_out_xshm.c index 00d3bee1c..bf0d3b7f0 100644 --- a/src/video_out/video_out_xshm.c +++ b/src/video_out/video_out_xshm.c @@ -15,17 +15,14 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * - * $Id: video_out_xshm.c,v 1.150 2007/03/25 23:13:53 dgp85 Exp $ - * * 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 b20a28c84..07b1e1186 100644 --- a/src/video_out/video_out_xv.c +++ b/src/video_out/video_out_xv.c @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: video_out_xv.c,v 1.224 2007/03/29 19:01:03 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * video_out_xv.c, X11 video extension interface for xine * diff --git a/src/video_out/video_out_xvmc.c b/src/video_out/video_out_xvmc.c index 53d09b7d5..8f7b1defc 100644 --- a/src/video_out/video_out_xvmc.c +++ b/src/video_out/video_out_xvmc.c @@ -15,10 +15,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * - * $Id: video_out_xvmc.c,v 1.29 2007/03/25 23:07:23 dgp85 Exp $ - * * 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 5dd3cb118..db5b753f5 100644 --- a/src/video_out/video_out_xxmc.c +++ b/src/video_out/video_out_xxmc.c @@ -16,9 +16,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - * - * $Id: video_out_xxmc.c,v 1.23 2007/03/25 23:13:53 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * video_out_xxmc.c, X11 decoding accelerated video extension interface for xine * @@ -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 dbfa53ec7..e0cb6f1f6 100644 --- a/src/video_out/x11osd.c +++ b/src/video_out/x11osd.c @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: x11osd.c,v 1.15 2005/09/25 00:44:04 miguelfreitas Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * x11osd.c, use X11 Nonrectangular Window Shape Extension to draw xine OSD * diff --git a/src/video_out/x11osd.h b/src/video_out/x11osd.h index 3fae9968d..fe0bf6208 100644 --- a/src/video_out/x11osd.h +++ b/src/video_out/x11osd.h @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: x11osd.h,v 1.4 2004/04/10 15:31:10 miguelfreitas Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * x11osd.h, use X11 Nonrectangular Window Shape Extension to draw xine OSD * diff --git a/src/video_out/xcbosd.c b/src/video_out/xcbosd.c index 9013bab10..4bb2b60af 100644 --- a/src/video_out/xcbosd.c +++ b/src/video_out/xcbosd.c @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: xcbosd.c,v 1.1 2007/02/15 15:19:33 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * xcbosd.c, use X11 Nonrectangular Window Shape Extension to draw xine OSD * diff --git a/src/video_out/xcbosd.h b/src/video_out/xcbosd.h index f948c9baf..32af4965e 100644 --- a/src/video_out/xcbosd.h +++ b/src/video_out/xcbosd.h @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: xcbosd.h,v 1.1 2007/02/15 15:19:33 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * xcbosd.h, use X11 Nonrectangular Window Shape Extension to draw xine OSD * diff --git a/src/video_out/xvmc_mocomp.c b/src/video_out/xvmc_mocomp.c index 970c243dd..faa2b0010 100644 --- a/src/video_out/xvmc_mocomp.c +++ b/src/video_out/xvmc_mocomp.c @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: xvmc_mocomp.c,v 1.4 2005/05/06 07:42:21 totte67 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * XvMC image support by Jack Kelliher */ diff --git a/src/video_out/xvmc_vld.c b/src/video_out/xvmc_vld.c index 953b65563..b81578276 100644 --- a/src/video_out/xvmc_vld.c +++ b/src/video_out/xvmc_vld.c @@ -16,9 +16,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - * - * $Id: xvmc_vld.c,v 1.4 2005/05/06 07:42:21 totte67 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * xvmc_vld.c, X11 decoding accelerated video extension interface for xine * diff --git a/src/video_out/xxmc.h b/src/video_out/xxmc.h index a25e651e4..1c24991be 100644 --- a/src/video_out/xxmc.h +++ b/src/video_out/xxmc.h @@ -16,9 +16,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - * - * $Id: xxmc.h,v 1.9 2005/09/25 00:44:04 miguelfreitas Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * video_out_xxmc.c, X11 decoding accelerated video extension interface for xine * diff --git a/src/video_out/yuv2rgb.c b/src/video_out/yuv2rgb.c index 5fc04f688..0ca6537a7 100644 --- a/src/video_out/yuv2rgb.c +++ b/src/video_out/yuv2rgb.c @@ -21,9 +21,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: yuv2rgb.c,v 1.52 2006/06/20 01:07:59 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ #include "config.h" diff --git a/src/video_out/yuv2rgb_mlib.c b/src/video_out/yuv2rgb_mlib.c index bbc8901e8..8635526ed 100644 --- a/src/video_out/yuv2rgb_mlib.c +++ b/src/video_out/yuv2rgb_mlib.c @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ #include "config.h" diff --git a/src/video_out/yuv2rgb_mmx.c b/src/video_out/yuv2rgb_mmx.c index 4cbd7d29e..20a9b5a00 100644 --- a/src/video_out/yuv2rgb_mmx.c +++ b/src/video_out/yuv2rgb_mmx.c @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ #include "config.h" diff --git a/src/xine-engine/accel_xvmc.h b/src/xine-engine/accel_xvmc.h index 46cbfba22..cec5f9558 100644 --- a/src/xine-engine/accel_xvmc.h +++ b/src/xine-engine/accel_xvmc.h @@ -16,9 +16,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - * - * $Id: accel_xvmc.h,v 1.3 2005/05/06 07:42:21 totte67 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * * Common acceleration definitions for XvMC. diff --git a/src/xine-engine/alphablend.c b/src/xine-engine/alphablend.c index 25c223272..8fcc4c469 100644 --- a/src/xine-engine/alphablend.c +++ b/src/xine-engine/alphablend.c @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA. * *------------------------------------------------------------ * diff --git a/src/xine-engine/alphablend.h b/src/xine-engine/alphablend.h index 513ac116f..3c9a693d9 100644 --- a/src/xine-engine/alphablend.h +++ b/src/xine-engine/alphablend.h @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA. * * The author may be reached as <dent@linuxvideo.org> * diff --git a/src/xine-engine/audio_decoder.c b/src/xine-engine/audio_decoder.c index c271fc6fc..5476262d9 100644 --- a/src/xine-engine/audio_decoder.c +++ b/src/xine-engine/audio_decoder.c @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: audio_decoder.c,v 1.139 2007/02/20 00:34:57 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * * functions that implement audio decoding diff --git a/src/xine-engine/audio_decoder.h b/src/xine-engine/audio_decoder.h index a88b02dc8..8f75ba242 100644 --- a/src/xine-engine/audio_decoder.h +++ b/src/xine-engine/audio_decoder.h @@ -15,12 +15,9 @@ * * You should have received a copy of the GNU General Public 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: audio_decoder.h,v 1.13 2004/09/26 22:54:52 valtri Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * 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 fb2f495d5..def102ef3 100644 --- a/src/xine-engine/audio_out.c +++ b/src/xine-engine/audio_out.c @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with self program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - * - * $Id: audio_out.c,v 1.210 2007/04/01 00:52:36 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * 22-8-2001 James imported some useful AC3 sections from the previous alsa driver. * (c) 2001 Andy Lo A Foe <andy@alsaplayer.org> @@ -53,7 +51,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 c5f335dbb..c4581ec24 100644 --- a/src/xine-engine/audio_out.h +++ b/src/xine-engine/audio_out.h @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: audio_out.h,v 1.77 2006/09/26 05:19:48 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ #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 43390ede5..1d2f01366 100644 --- a/src/xine-engine/broadcaster.c +++ b/src/xine-engine/broadcaster.c @@ -17,10 +17,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * - * $Id: broadcaster.c,v 1.15 2007/01/19 01:23:06 dgp85 Exp $ - * * 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 bc0d2feab..093fb4af0 100644 --- a/src/xine-engine/broadcaster.h +++ b/src/xine-engine/broadcaster.h @@ -15,12 +15,9 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * - * $Id: broadcaster.h,v 1.3 2006/09/26 05:19:48 dgp85 Exp $ - * * broadcaster.h - * */ #ifndef HAVE_BROADCASTER_H diff --git a/src/xine-engine/bswap.h b/src/xine-engine/bswap.h index 28b22cb71..635c6ae3a 100644 --- a/src/xine-engine/bswap.h +++ b/src/xine-engine/bswap.h @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ #ifndef __BSWAP_H__ diff --git a/src/xine-engine/buffer.c b/src/xine-engine/buffer.c index 389146dcb..93ad75ba0 100644 --- a/src/xine-engine/buffer.c +++ b/src/xine-engine/buffer.c @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: buffer.c,v 1.37 2006/12/25 21:59:32 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * * 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 706a1765e..b08960e7d 100644 --- a/src/xine-engine/buffer.h +++ b/src/xine-engine/buffer.h @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: buffer.h,v 1.162 2007/01/14 16:53:37 klan Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * * 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 a8c926821..129d8d194 100644 --- a/src/xine-engine/buffer_types.c +++ b/src/xine-engine/buffer_types.c @@ -15,16 +15,13 @@ * * You should have received a copy of the GNU General Public 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: buffer_types.c,v 1.107 2006/12/26 03:18:56 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * * contents: * * buffer types management. * convert FOURCC and audioformattag to BUF_xxx defines - * */ #ifdef HAVE_CONFIG_H @@ -59,6 +56,7 @@ static const video_db_t video_db[] = { ME_FOURCC('P', 'I', 'M', '1'), ME_FOURCC('m', 'p', 'g', '2'), ME_FOURCC('m', 'p', 'g', '1'), + ME_FOURCC(0x02, 0, 0, 0x10), 0 }, BUF_VIDEO_MPEG, @@ -1220,3 +1218,4 @@ void _x_waveformatex_le2me( xine_waveformatex *wavex ) { wavex->wBitsPerSample = le2me_16(wavex->wBitsPerSample); wavex->cbSize = le2me_16(wavex->cbSize); } + diff --git a/src/xine-engine/configfile.c b/src/xine-engine/configfile.c index cc3f21db8..2f5e6214a 100644 --- a/src/xine-engine/configfile.c +++ b/src/xine-engine/configfile.c @@ -15,12 +15,9 @@ * * You should have received a copy of the GNU General Public 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: configfile.c,v 1.85 2007/02/22 15:49:16 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * 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 859214d1c..e21b08db0 100644 --- a/src/xine-engine/configfile.h +++ b/src/xine-engine/configfile.h @@ -15,12 +15,9 @@ * * You should have received a copy of the GNU General Public 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: configfile.h,v 1.42 2007/02/22 15:49:16 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * config file management - * */ #ifndef HAVE_CONFIGFILE_H diff --git a/src/xine-engine/demux.c b/src/xine-engine/demux.c index d1bd2bc1d..f33397256 100644 --- a/src/xine-engine/demux.c +++ b/src/xine-engine/demux.c @@ -15,12 +15,10 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * Demuxer helper functions * hide some xine engine details from demuxers and reduce code duplication - * - * $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 990cbe787..f79187682 100644 --- a/src/xine-engine/events.c +++ b/src/xine-engine/events.c @@ -15,12 +15,9 @@ * * You should have received a copy of the GNU General Public 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: events.c,v 1.32 2006/10/16 22:18:24 valtri Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * Event handling functions - * */ #ifdef HAVE_CONFIG_H diff --git a/src/xine-engine/info_helper.c b/src/xine-engine/info_helper.c index e38b5e5c4..1ac4ed982 100644 --- a/src/xine-engine/info_helper.c +++ b/src/xine-engine/info_helper.c @@ -15,12 +15,10 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * stream metainfo helper functions * hide some xine engine details from demuxers and reduce code duplication - * - * $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/info_helper.h b/src/xine-engine/info_helper.h index a21372e22..d4123ba2b 100644 --- a/src/xine-engine/info_helper.h +++ b/src/xine-engine/info_helper.h @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * stream metainfo helper functions * hide some xine engine details from demuxers and reduce code duplication diff --git a/src/xine-engine/input_cache.c b/src/xine-engine/input_cache.c index 75c4beb43..2baa67c7c 100644 --- a/src/xine-engine/input_cache.c +++ b/src/xine-engine/input_cache.c @@ -15,14 +15,12 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * Buffered Input Plugin (request optimizer). * * 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 56850ba2d..0c185aa1b 100644 --- a/src/xine-engine/input_rip.c +++ b/src/xine-engine/input_rip.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * Rip Input Plugin for catching streams * @@ -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/io_helper.c b/src/xine-engine/io_helper.c index 67dddcfdc..c3654c762 100644 --- a/src/xine-engine/io_helper.c +++ b/src/xine-engine/io_helper.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * abortable i/o helper functions */ diff --git a/src/xine-engine/io_helper.h b/src/xine-engine/io_helper.h index 3b7cac17a..3e96e8dc1 100644 --- a/src/xine-engine/io_helper.h +++ b/src/xine-engine/io_helper.h @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * abortable i/o helper functions */ diff --git a/src/xine-engine/load_plugins.c b/src/xine-engine/load_plugins.c index 912455b18..71cb19d3b 100644 --- a/src/xine-engine/load_plugins.c +++ b/src/xine-engine/load_plugins.c @@ -15,13 +15,10 @@ * * You should have received a copy of the GNU General Public 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: load_plugins.c,v 1.230 2007/02/19 23:33:33 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * * Load input/demux/audio_out/video_out/codec plugins - * */ #ifdef HAVE_CONFIG_H @@ -153,7 +150,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 87465aaef..6da846a7c 100644 --- a/src/xine-engine/lrb.c +++ b/src/xine-engine/lrb.c @@ -15,10 +15,7 @@ * * You should have received a copy of the GNU General Public 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: lrb.c,v 1.8 2003/12/09 00:02:36 f1rmb Exp $ - * + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ #ifdef HAVE_CONFIG_H diff --git a/src/xine-engine/lrb.h b/src/xine-engine/lrb.h index 1b53ed929..491ae8843 100644 --- a/src/xine-engine/lrb.h +++ b/src/xine-engine/lrb.h @@ -15,13 +15,10 @@ * * You should have received a copy of the GNU General Public 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: lrb.h,v 1.4 2003/12/09 00:02:36 f1rmb Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * 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 fa33da9e1..5d3e0a12d 100644 --- a/src/xine-engine/metronom.c +++ b/src/xine-engine/metronom.c @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: metronom.c,v 1.144 2007/02/20 00:34:57 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ #ifdef HAVE_CONFIG_H diff --git a/src/xine-engine/metronom.h b/src/xine-engine/metronom.h index 1628ba9fd..20e31117c 100644 --- a/src/xine-engine/metronom.h +++ b/src/xine-engine/metronom.h @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: metronom.h,v 1.64 2006/09/26 05:19:49 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * metronom: general pts => virtual calculation/assoc * @@ -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.c b/src/xine-engine/osd.c index ebc12300b..ef888e7a4 100644 --- a/src/xine-engine/osd.c +++ b/src/xine-engine/osd.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * OSD stuff (text and graphic primitives) */ diff --git a/src/xine-engine/osd.h b/src/xine-engine/osd.h index 6c7be8f0b..38b5d1fdd 100644 --- a/src/xine-engine/osd.h +++ b/src/xine-engine/osd.h @@ -15,10 +15,9 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * OSD stuff (text and graphic primitives) - * $Id: osd.h,v 1.27 2006/09/26 05:19:49 dgp85 Exp $ */ #ifndef HAVE_OSD_H diff --git a/src/xine-engine/plugin_catalog.h b/src/xine-engine/plugin_catalog.h index 5bd1c4701..a28321760 100644 --- a/src/xine-engine/plugin_catalog.h +++ b/src/xine-engine/plugin_catalog.h @@ -15,12 +15,9 @@ * * You should have received a copy of the GNU General Public 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: plugin_catalog.h,v 1.21 2006/09/26 05:19:49 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * 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 32c8f9453..5d8d67037 100644 --- a/src/xine-engine/post.c +++ b/src/xine-engine/post.c @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: post.c,v 1.32 2006/01/27 07:46:15 tmattern Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ /* diff --git a/src/xine-engine/post.h b/src/xine-engine/post.h index bcdc3c54b..b06c7930a 100644 --- a/src/xine-engine/post.h +++ b/src/xine-engine/post.h @@ -15,12 +15,9 @@ * * You should have received a copy of the GNU General Public 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: post.h,v 1.26 2007/02/20 01:13:08 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * post plugin definitions - * */ #ifndef XINE_POST_H diff --git a/src/xine-engine/refcounter.c b/src/xine-engine/refcounter.c index 18c2ad1ce..539abf3ed 100644 --- a/src/xine-engine/refcounter.c +++ b/src/xine-engine/refcounter.c @@ -15,10 +15,7 @@ * * You should have received a copy of the GNU General Public 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: refcounter.c,v 1.2 2006/09/26 05:19:49 dgp85 Exp $ - * + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ #define LOG_MODULE "refcounter" #define LOG_VERBOSE diff --git a/src/xine-engine/refcounter.h b/src/xine-engine/refcounter.h index 640366b1f..87abd6321 100644 --- a/src/xine-engine/refcounter.h +++ b/src/xine-engine/refcounter.h @@ -15,10 +15,7 @@ * * You should have received a copy of the GNU General Public 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: refcounter.h,v 1.2 2006/09/26 05:19:49 dgp85 Exp $ - * + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ #ifndef HAVE_REFCOUNTER_H #define HAVE_REFCOUNTER_H diff --git a/src/xine-engine/resample.c b/src/xine-engine/resample.c index 1bc9dfaf9..43911c401 100644 --- a/src/xine-engine/resample.c +++ b/src/xine-engine/resample.c @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: resample.c,v 1.10 2006/09/26 05:19:49 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ #ifdef HAVE_CONFIG_H diff --git a/src/xine-engine/resample.h b/src/xine-engine/resample.h index 1fd478d06..40b4de486 100644 --- a/src/xine-engine/resample.h +++ b/src/xine-engine/resample.h @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: resample.h,v 1.6 2006/09/26 05:19:49 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * utilitiy functions for audio drivers * diff --git a/src/xine-engine/scratch.c b/src/xine-engine/scratch.c index 67281b041..38b606b84 100644 --- a/src/xine-engine/scratch.c +++ b/src/xine-engine/scratch.c @@ -15,12 +15,9 @@ * * You should have received a copy of the GNU General Public 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: scratch.c,v 1.24 2007/01/19 00:12:22 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * top-level xine functions - * */ #ifdef HAVE_CONFIG_H diff --git a/src/xine-engine/scratch.h b/src/xine-engine/scratch.h index bcfe815c3..c0e591d31 100644 --- a/src/xine-engine/scratch.h +++ b/src/xine-engine/scratch.h @@ -15,12 +15,9 @@ * * You should have received a copy of the GNU General Public 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: scratch.h,v 1.13 2007/01/19 00:12:22 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * scratch buffer for log output - * */ #ifndef HAVE_SCRATCH_H diff --git a/src/xine-engine/tvmode.c b/src/xine-engine/tvmode.c index b7a34e673..099bdb808 100644 --- a/src/xine-engine/tvmode.c +++ b/src/xine-engine/tvmode.c @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: tvmode.c,v 1.17 2003/12/09 00:02:37 f1rmb Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * tvmode - TV output selection * diff --git a/src/xine-engine/video_decoder.c b/src/xine-engine/video_decoder.c index fee75ec76..c371d7657 100644 --- a/src/xine-engine/video_decoder.c +++ b/src/xine-engine/video_decoder.c @@ -15,10 +15,7 @@ * * You should have received a copy of the GNU General Public 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: video_decoder.c,v 1.163 2007/02/20 00:34:58 dgp85 Exp $ - * + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ #ifdef HAVE_CONFIG_H diff --git a/src/xine-engine/video_decoder.h b/src/xine-engine/video_decoder.h index 42120b724..7b13159a3 100644 --- a/src/xine-engine/video_decoder.h +++ b/src/xine-engine/video_decoder.h @@ -15,12 +15,9 @@ * * You should have received a copy of the GNU General Public 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: video_decoder.h,v 1.14 2004/09/26 22:54:52 valtri Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * 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 2a3ee1980..b961c6060 100644 --- a/src/xine-engine/video_out.c +++ b/src/xine-engine/video_out.c @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: video_out.c,v 1.228 2007/04/01 01:03:06 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * frame allocation / queuing / scheduling / output functions */ diff --git a/src/xine-engine/video_out.h b/src/xine-engine/video_out.h index 085752dd8..308e809f1 100644 --- a/src/xine-engine/video_out.h +++ b/src/xine-engine/video_out.h @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: video_out.h,v 1.114 2006/09/26 05:19:49 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * * 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 574f42ac3..c189fa56b 100644 --- a/src/xine-engine/video_overlay.c +++ b/src/xine-engine/video_overlay.c @@ -15,10 +15,7 @@ * * You should have received a copy of the GNU General Public 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: video_overlay.c,v 1.41 2006/09/26 00:28:14 dgp85 Exp $ - * + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ #include <stdlib.h> diff --git a/src/xine-engine/video_overlay.h b/src/xine-engine/video_overlay.h index 1e7a2bcca..d580a1e83 100644 --- a/src/xine-engine/video_overlay.h +++ b/src/xine-engine/video_overlay.h @@ -15,10 +15,7 @@ * * You should have received a copy of the GNU General Public 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: video_overlay.h,v 1.21 2006/09/26 05:19:49 dgp85 Exp $ - * + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ #ifndef HAVE_VIDEO_OVERLAY_H diff --git a/src/xine-engine/vo_scale.c b/src/xine-engine/vo_scale.c index b2f3001d0..ff30c47a6 100644 --- a/src/xine-engine/vo_scale.c +++ b/src/xine-engine/vo_scale.c @@ -15,10 +15,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * - * $Id: vo_scale.c,v 1.39 2006/09/26 08:00:02 dgp85 Exp $ - * * 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 917b6c99e..829405162 100644 --- a/src/xine-engine/vo_scale.h +++ b/src/xine-engine/vo_scale.h @@ -15,10 +15,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * - * $Id: vo_scale.h,v 1.14 2006/09/26 05:19:49 dgp85 Exp $ - * * vo_scale.h * * keeps video scaling information diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c index 01ca48aa2..301521e9b 100644 --- a/src/xine-engine/xine.c +++ b/src/xine-engine/xine.c @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: xine.c,v 1.342 2007/02/20 00:37:02 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ /* diff --git a/src/xine-engine/xine_interface.c b/src/xine-engine/xine_interface.c index a4a7ecbf9..48f3a6df0 100644 --- a/src/xine-engine/xine_interface.c +++ b/src/xine-engine/xine_interface.c @@ -15,13 +15,10 @@ * * You should have received a copy of the GNU General Public 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: xine_interface.c,v 1.104 2007/03/26 11:48:01 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * 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 5523001ca..9b69f16f1 100644 --- a/src/xine-engine/xine_internal.h +++ b/src/xine-engine/xine_internal.h @@ -15,10 +15,7 @@ * * You should have received a copy of the GNU General Public 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: xine_internal.h,v 1.181 2007/01/18 23:28:46 dgp85 Exp $ - * + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ #ifndef HAVE_XINE_INTERNAL_H diff --git a/src/xine-engine/xine_plugin.h b/src/xine-engine/xine_plugin.h index 4ddb65eda..74e7523e9 100644 --- a/src/xine-engine/xine_plugin.h +++ b/src/xine-engine/xine_plugin.h @@ -15,12 +15,9 @@ * * You should have received a copy of the GNU General Public 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: xine_plugin.h,v 1.23 2007/01/19 02:49:31 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * generic plugin definitions - * */ #ifndef XINE_PLUGIN_H diff --git a/src/xine-engine/xineintl.h b/src/xine-engine/xineintl.h index 614195193..113a033fa 100644 --- a/src/xine-engine/xineintl.h +++ b/src/xine-engine/xineintl.h @@ -15,10 +15,7 @@ * * You should have received a copy of the GNU General Public 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: xineintl.h,v 1.9 2005/02/19 13:11:53 valtri Exp $ - * + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ #ifndef HAVE_XINEINTL_H diff --git a/src/xine-utils/array.c b/src/xine-utils/array.c index ed529515b..6c226c7ef 100644 --- a/src/xine-utils/array.c +++ b/src/xine-utils/array.c @@ -15,10 +15,7 @@ * * You should have received a copy of the GNU General Public 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: array.c,v 1.4 2007/02/03 16:31:55 dsalt Exp $ - * + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/src/xine-utils/array.h b/src/xine-utils/array.h index 80b7d3c9b..ae2093823 100644 --- a/src/xine-utils/array.h +++ b/src/xine-utils/array.h @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: array.h,v 1.3 2007/02/03 16:31:55 dsalt Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * 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/attributes.h b/src/xine-utils/attributes.h index f7f5a111c..563832e5c 100644 --- a/src/xine-utils/attributes.h +++ b/src/xine-utils/attributes.h @@ -18,7 +18,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ /* use gcc attribs to align critical data structures */ diff --git a/src/xine-utils/color.c b/src/xine-utils/color.c index c5d42be9d..0b9cf0188 100644 --- a/src/xine-utils/color.c +++ b/src/xine-utils/color.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * Color Conversion Utility Functions * @@ -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 a6592b030..d4b95aeb3 100644 --- a/src/xine-utils/compat.h +++ b/src/xine-utils/compat.h @@ -15,10 +15,7 @@ * * You should have received a copy of the GNU General Public 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: compat.h,v 1.3 2003/04/20 21:13:26 guenter Exp $ - * + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ #ifndef XINE_COMPAT_H diff --git a/src/xine-utils/copy.c b/src/xine-utils/copy.c index 1a609ed89..ed42b3a88 100644 --- a/src/xine-utils/copy.c +++ b/src/xine-utils/copy.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * $Id: * diff --git a/src/xine-utils/cpu_accel.c b/src/xine-utils/cpu_accel.c index b32733fba..c241dd7ef 100644 --- a/src/xine-utils/cpu_accel.c +++ b/src/xine-utils/cpu_accel.c @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ #include "config.h" diff --git a/src/xine-utils/list.c b/src/xine-utils/list.c index 2c790c3db..65bdaec26 100644 --- a/src/xine-utils/list.c +++ b/src/xine-utils/list.c @@ -15,10 +15,7 @@ * * You should have received a copy of the GNU General Public 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: list.c,v 1.12 2006/09/26 05:19:49 dgp85 Exp $ - * + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ #ifdef HAVE_CONFIG_H diff --git a/src/xine-utils/list.h b/src/xine-utils/list.h index 8273d30f1..e00e30d6c 100644 --- a/src/xine-utils/list.h +++ b/src/xine-utils/list.h @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: list.h,v 1.5 2007/02/19 23:34:32 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * Doubly-linked linked list. * diff --git a/src/xine-utils/memcpy.c b/src/xine-utils/memcpy.c index 539f4c8dd..1b3e38fd1 100644 --- a/src/xine-utils/memcpy.c +++ b/src/xine-utils/memcpy.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * These are the MMX/MMX2/SSE optimized versions of memcpy * diff --git a/src/xine-utils/monitor.c b/src/xine-utils/monitor.c index c0cfd6179..fb323055c 100644 --- a/src/xine-utils/monitor.c +++ b/src/xine-utils/monitor.c @@ -15,12 +15,9 @@ * * You should have received a copy of the GNU General Public 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: monitor.c,v 1.8 2006/06/23 18:24:22 dsalt Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * 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 39dbccb0c..a1fddadd9 100644 --- a/src/xine-utils/pool.c +++ b/src/xine-utils/pool.c @@ -15,10 +15,7 @@ * * You should have received a copy of the GNU General Public 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: pool.c,v 1.2 2006/09/26 05:19:49 dgp85 Exp $ - * + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/src/xine-utils/pool.h b/src/xine-utils/pool.h index 5f6e4bd7e..918da82a2 100644 --- a/src/xine-utils/pool.h +++ b/src/xine-utils/pool.h @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: pool.h,v 1.2 2006/09/26 05:19:49 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * Object Pool */ diff --git a/src/xine-utils/ring_buffer.c b/src/xine-utils/ring_buffer.c index dc8ddbf80..031fda4fc 100644 --- a/src/xine-utils/ring_buffer.c +++ b/src/xine-utils/ring_buffer.c @@ -15,10 +15,7 @@ * * You should have received a copy of the GNU General Public 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: ring_buffer.c,v 1.5 2006/09/26 05:19:49 dgp85 Exp $ - * + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/src/xine-utils/ring_buffer.h b/src/xine-utils/ring_buffer.h index fc826ba21..efcffd3b7 100644 --- a/src/xine-utils/ring_buffer.h +++ b/src/xine-utils/ring_buffer.h @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: ring_buffer.h,v 1.3 2006/09/26 05:19:49 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * Fifo + Ring Buffer */ diff --git a/src/xine-utils/sorted_array.c b/src/xine-utils/sorted_array.c index c69d92d40..363325f0b 100644 --- a/src/xine-utils/sorted_array.c +++ b/src/xine-utils/sorted_array.c @@ -15,10 +15,7 @@ * * You should have received a copy of the GNU General Public 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: sorted_array.c,v 1.3 2006/09/26 05:19:49 dgp85 Exp $ - * + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/src/xine-utils/sorted_array.h b/src/xine-utils/sorted_array.h index 767a2913c..a1894eca3 100644 --- a/src/xine-utils/sorted_array.h +++ b/src/xine-utils/sorted_array.h @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: sorted_array.h,v 1.3 2006/09/26 05:19:49 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * 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 fa0c11dbe..47c32b713 100644 --- a/src/xine-utils/utils.c +++ b/src/xine-utils/utils.c @@ -15,10 +15,7 @@ * * You should have received a copy of the GNU General Public 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: utils.c,v 1.46 2006/07/21 04:47:17 dgp85 Exp $ - * + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ #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 17b3a79db..190ab5197 100644 --- a/src/xine-utils/xine_buffer.c +++ b/src/xine-utils/xine_buffer.c @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: xine_buffer.c,v 1.11 2006/06/23 18:24:22 dsalt Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * * generic dynamic buffer functions. The goals diff --git a/src/xine-utils/xine_buffer.h b/src/xine-utils/xine_buffer.h index 02a9e2cb1..84511bd1b 100644 --- a/src/xine-utils/xine_buffer.h +++ b/src/xine-utils/xine_buffer.h @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public 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: xine_buffer.h,v 1.7 2006/09/26 05:19:49 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * * generic dynamic buffer functions. The goals diff --git a/src/xine-utils/xine_check.c b/src/xine-utils/xine_check.c index f6a0498e8..f00a23832 100644 --- a/src/xine-utils/xine_check.c +++ b/src/xine-utils/xine_check.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA +* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * Xine Health Check: * diff --git a/src/xine-utils/xine_mutex.c b/src/xine-utils/xine_mutex.c index e6b5025c8..c94f32be0 100644 --- a/src/xine-utils/xine_mutex.c +++ b/src/xine-utils/xine_mutex.c @@ -15,10 +15,7 @@ * * You should have received a copy of the GNU General Public 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: xine_mutex.c,v 1.5 2006/07/16 14:45:24 dsalt Exp $ - * + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ #ifdef HAVE_CONFIG_H diff --git a/src/xine-utils/xineutils.h b/src/xine-utils/xineutils.h index 03c5f689a..120cb3578 100644 --- a/src/xine-utils/xineutils.h +++ b/src/xine-utils/xineutils.h @@ -15,10 +15,7 @@ * * You should have received a copy of the GNU General Public 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: xineutils.h,v 1.107 2006/12/25 15:16:33 dgp85 Exp $ - * + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ #ifndef XINEUTILS_H #define XINEUTILS_H diff --git a/src/xine-utils/xmllexer.c b/src/xine-utils/xmllexer.c index 754a006f9..8879f7d0c 100644 --- a/src/xine-utils/xmllexer.c +++ b/src/xine-utils/xmllexer.c @@ -15,11 +15,8 @@ * * You should have received a copy of the GNU Library General Public * License along with the Gnome Library; see the file COPYING.LIB. If not, - * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - * - * $Id: xmllexer.c,v 1.13 2007/03/04 16:19:12 hadess Exp $ - * + * write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth + * Floor, Boston, MA 02110, USA */ #define LOG_MODULE "xmllexer" @@ -39,6 +36,9 @@ #include <ctype.h> #include <string.h> #include <stdlib.h> +#ifdef HAVE_ICONV +#include <iconv.h> +#endif /* private constants*/ #define NORMAL 0 /* normal lex mode */ @@ -463,7 +463,7 @@ char *lexer_decode_entities (const char *tok) { /* parse the character entity (on failure, treat it as literal text) */ const char *tp = tok; - long i; + signed long i; for (i = 0; lexer_entities[i].code; ++i) if (!strncmp (lexer_entities[i].name, tok, lexer_entities[i].namelen) @@ -491,7 +491,7 @@ char *lexer_decode_entities (const char *tok) else i = strtol (tp, (char **)&tp, 10); - if (i < 1 || i > 255 || *tp != ';') + if (*tp != ';' || i < 1) { /* out of range, or format error */ *bp++ = '&'; @@ -499,7 +499,23 @@ char *lexer_decode_entities (const char *tok) } tok = tp + 1; - *bp++ = i; + + if (i < 128) + /* ASCII - store as-is */ + *bp++ = i; + else + { + /* Non-ASCII, so convert to UTF-8 */ + int count = (i >= 0x04000000) ? 5 : + (i >= 0x00200000) ? 4 : + (i >= 0x00010000) ? 3 : + (i >= 0x00000800) ? 2 : 1; + *bp = (char)(0x1F80 >> count); + count *= 6; + *bp++ |= i >> count; + while ((count -= 6) >= 0) + *bp++ = 128 | ((i >> count) & 0x3F); + } } } *bp = 0; diff --git a/src/xine-utils/xmllexer.h b/src/xine-utils/xmllexer.h index 5a217fcd8..1e646f9b5 100644 --- a/src/xine-utils/xmllexer.h +++ b/src/xine-utils/xmllexer.h @@ -15,11 +15,8 @@ * * You should have received a copy of the GNU Library General Public * License along with the Gnome Library; see the file COPYING.LIB. If not, - * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - * - * $Id: xmllexer.h,v 1.8 2007/03/04 16:19:12 hadess Exp $ - * + * write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth + * Floor, Boston, MA 02110, USA */ /* xml lexer */ diff --git a/src/xine-utils/xmlparser.c b/src/xine-utils/xmlparser.c index 2ace4aba1..a5d8212d2 100644 --- a/src/xine-utils/xmlparser.c +++ b/src/xine-utils/xmlparser.c @@ -15,11 +15,8 @@ * * You should have received a copy of the GNU Library General Public * License along with the Gnome Library; see the file COPYING.LIB. If not, - * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - * - * $Id: xmlparser.c,v 1.16 2007/03/04 16:19:12 hadess Exp $ - * + * write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth + * Floor, Boston, MA 02110, USA */ #include <unistd.h> diff --git a/src/xine-utils/xmlparser.h b/src/xine-utils/xmlparser.h index f202ca28d..98695a756 100644 --- a/src/xine-utils/xmlparser.h +++ b/src/xine-utils/xmlparser.h @@ -15,11 +15,8 @@ * * You should have received a copy of the GNU Library General Public * License along with the Gnome Library; see the file COPYING.LIB. If not, - * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - * - * $Id: xmlparser.h,v 1.6 2007/03/04 16:19:12 hadess Exp $ - * + * write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth + * Floor, Boston, MA 02110, USA */ #ifndef XML_PARSER_H diff --git a/win32/include/dlfcn.h b/win32/include/dlfcn.h index b020daaac..648fae38d 100644 --- a/win32/include/dlfcn.h +++ b/win32/include/dlfcn.h @@ -15,7 +15,7 @@ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
*
* WIN32 PORT,
* by Matthew Grooms <elon@altavista.com>
diff --git a/win32/include/msvc/inttypes.h b/win32/include/msvc/inttypes.h index 2934bf43a..e1aa46b74 100644 --- a/win32/include/msvc/inttypes.h +++ b/win32/include/msvc/inttypes.h @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * WIN32 PORT, * by Matthew Grooms <elon@altavista.com> diff --git a/win32/include/msvc/stdint.h b/win32/include/msvc/stdint.h index 7b9d4a090..bf0316dd1 100644 --- a/win32/include/msvc/stdint.h +++ b/win32/include/msvc/stdint.h @@ -25,9 +25,7 @@ details. */ * * You should have received a copy of the GNU General Public License * along with self program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - * - * $Id: stdint.h,v 1.2 2004/09/20 19:30:08 valtri Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ /* Modified original CygWin version for using by MSVC port. */ diff --git a/win32/include/msvc/sys/time.h b/win32/include/msvc/sys/time.h index 074a8a1e6..2664d2a58 100644 --- a/win32/include/msvc/sys/time.h +++ b/win32/include/msvc/sys/time.h @@ -15,7 +15,7 @@ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
*
* WIN32 PORT,
* by Matthew Grooms <elon@altavista.com>
diff --git a/win32/include/sys/socket.h b/win32/include/sys/socket.h index 7786114a8..e3fd4872a 100644 --- a/win32/include/sys/socket.h +++ b/win32/include/sys/socket.h @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * WIN32 PORT, */ |