diff options
81 files changed, 1385 insertions, 351 deletions
diff --git a/DOCS/man/fr/mplayer.1 b/DOCS/man/fr/mplayer.1 index a5148bb8fe..a2f2022bbe 100644 --- a/DOCS/man/fr/mplayer.1 +++ b/DOCS/man/fr/mplayer.1 @@ -1647,7 +1647,7 @@ Se rabat automatiquement sur IPv6. . .TP .B \-prefer\-ipv6 (réseau IPv6 uniquement) -Utilise IPv4 pour les connections réseau. +Utilise IPv6 pour les connections réseau. Se rabat automatiquement sur IPv4. . .TP diff --git a/DOCS/xml/en/skin.xml b/DOCS/xml/en/skin.xml index 2be4e940d4..d2ace85c22 100644 --- a/DOCS/xml/en/skin.xml +++ b/DOCS/xml/en/skin.xml @@ -6,62 +6,8 @@ <sect1 id="skin-overview"> <title>Overview</title> -<para> -It does not really have anything to do with the skin format, but you should -know that <application>MPlayer</application> has -<emphasis role="bold">no</emphasis> builtin skin, so -<emphasis role="bold">at least one skin must be installed in order to be able -to use the GUI.</emphasis> -</para> - <!-- ********** --> -<sect2 id="skin-overview-directories"> -<title>Directories</title> - -<para> -The directories searched for skins are (in order): -<orderedlist> -<listitem><para> - <filename class="directory">$(DATADIR)/skins/</filename> -</para></listitem> -<listitem><para> - <filename class="directory">$(PREFIX)/share/mplayer/skins/</filename> -</para></listitem> -<listitem><para> - <filename class="directory">~/.mplayer/skins/</filename> -</para></listitem> -</orderedlist> -</para> - -<para> -Note that the first path may vary according to the way -<application>MPlayer</application> was configured (see the -<option>--prefix</option> and <option>--datadir</option> -arguments of the <command>configure</command> script). -</para> - -<para> -Every skin is installed into its own directory under one of the directories -listed above, for example: -<screen>$(PREFIX)/share/mplayer/skins/default/</screen> -</para> -</sect2> - -<!-- ********** --> - -<sect2 id="skin-overview-formats"> -<title>Image formats</title> - -<para>Images must be truecolor (24 or 32 bpp) PNGs.</para> -<para> -In the main window and in the playbar (see below) you can use images with -`transparency': Regions filled with the color #FF00FF (magenta) are fully -transparent when viewed by <application>MPlayer</application>. This means -that you can even have shaped windows if your X server has the XShape extension. -</para> -</sect2> - <sect2 id="skin-overview-components"> <title>Skin components</title> @@ -162,6 +108,18 @@ they are clicked. </para> </sect2> +<sect2 id="skin-overview-formats"> +<title>Image formats</title> + +<para>Images must be truecolor (24 or 32 bpp) PNGs.</para> +<para> +In the main window and in the playbar (see below) you can use images with +`transparency': Regions filled with the color #FF00FF (magenta) are fully +transparent when viewed by <application>MPlayer</application>. This means +that you can even have shaped windows if your X server has the XShape extension. +</para> +</sect2> + <!-- ********** --> <sect2 id="skin-files"> @@ -884,11 +884,10 @@ codec-cfg.d codec-cfg.o: codecs.conf.h $(DEPS) $(MENCODER_DEPS) $(MPLAYER_DEPS): help_mp.h $(call ADDSUFFIXES,.d .o,mpcommon vobsub stream/stream_cddb stream/network libmpdemux/muxer_avi gui/win32/gui): version.h -libdvdcss/%: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.10\" $(CFLAGS_LIBDVDCSS) -libdvdnav/%: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DHAVE_CONFIG_H -DVERSION=\"MPlayer-custom\" -libdvdnav/% stream/stream_dvdnav%: CFLAGS += $(CFLAGS_LIBDVDNAV) -libdvdread4/%: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DHAVE_CONFIG_H $(CFLAGS_LIBDVDCSS_DVDREAD) -libfaad2/%: CFLAGS += -Ilibfaad2 -D_GNU_SOURCE -DHAVE_CONFIG_H $(CFLAGS_FAAD_FIXED) +libdvdcss/%: CFLAGS := -Ilibdvdcss -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.10\" $(CFLAGS_LIBDVDCSS) $(CFLAGS) +libdvdnav/%: CFLAGS := -Ilibdvdnav -D__USE_UNIX98 -D_GNU_SOURCE -DHAVE_CONFIG_H -DVERSION=\"MPlayer-custom\" $(CFLAGS) +libdvdread4/%: CFLAGS := -Ilibdvdread4 -D__USE_UNIX98 -D_GNU_SOURCE $(CFLAGS_LIBDVDCSS_DVDREAD) $(CFLAGS) +libfaad2/%: CFLAGS := -Ilibfaad2 -D_GNU_SOURCE -DHAVE_CONFIG_H $(CFLAGS_FAAD_FIXED) $(CFLAGS) loader/%: CFLAGS += -Iloader -fno-omit-frame-pointer $(CFLAGS_NO_OMIT_LEAF_FRAME_POINTER) #loader/%: CFLAGS += -Ddbg_printf=__vprintf -DTRACE=__vprintf -DDETAILED_OUT @@ -896,6 +895,8 @@ loader/win32%: CFLAGS += $(CFLAGS_STACKREALIGN) mp3lib/decode_i586%: CFLAGS += -fomit-frame-pointer +stream/stream_dvdnav%: CFLAGS := $(CFLAGS_LIBDVDNAV) $(CFLAGS) + tremor/%: CFLAGS += $(CFLAGS_TREMOR_LOW) vidix/%: CFLAGS += $(CFLAGS_DHAHELPER) $(CFLAGS_SVGALIB_HELPER) @@ -2090,12 +2090,14 @@ EOF ppc|ppc64|powerpc|powerpc64) _arch='PPC' def_dcbzl='#define HAVE_DCBZL 0' + def_ppc64='#define HAVE_PPC64 0' _target_arch='ARCH_PPC = yes' def_fast_unaligned='#define HAVE_FAST_UNALIGNED 1' iproc='ppc' if test "$host_arch" = "ppc64" -o "$host_arch" = "powerpc64" ; then def_fast_64bit='#define HAVE_FAST_64BIT 1' + def_ppc64='#define HAVE_PPC64 1' fi echocheck "CPU type" case $system_name in @@ -5817,7 +5819,7 @@ if test "$_dvdread_internal" = auto ; then || darwin || win32 || os2; then _dvdread_internal=yes _dvdread=yes - extra_cflags="$extra_cflags -Ilibdvdread4" + extra_cflags="-Ilibdvdread4 $extra_cflags" fi elif test "$_dvdread" = auto ; then _dvdread=no @@ -5830,15 +5832,15 @@ elif test "$_dvdread" = auto ; then #include <dvdread/nav_read.h> int main(void) { return 0; } EOF - fi - _dvdreadcflags=$($_dvdreadconfig --cflags) - _dvdreadlibs=$($_dvdreadconfig --libs) - if cc_check -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE \ - $_dvdreadcflags $_dvdreadlibs $_ld_dl ; then - _dvdread=yes - extra_cflags="$extra_cflags $_dvdreadcflags" - extra_ldflags="$extra_ldflags $_dvdreadlibs" - _res_comment="external" + _dvdreadcflags=$($_dvdreadconfig --cflags) + _dvdreadlibs=$($_dvdreadconfig --libs) + if cc_check -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE \ + $_dvdreadcflags $_dvdreadlibs $_ld_dl ; then + _dvdread=yes + extra_cflags="$extra_cflags $_dvdreadcflags" + extra_ldflags="$extra_ldflags $_dvdreadlibs" + _res_comment="external" + fi fi fi @@ -7378,6 +7380,7 @@ else _libavencoders="MPEG1VIDEO_ENCODER SNOW_ENCODER" test "$_zlib" = yes && _libavencoders="$_libavencoders PNG_ENCODER" _libavmuxers="" + def_muxers='#define CONFIG_MUXERS 0' fi echores "$_mencoder" @@ -8838,6 +8841,7 @@ $def_memalign_hack $def_mlib $def_mkstemp $def_posix_memalign +$def_ppc64 $def_pthreads $def_ten_operands $def_threads diff --git a/libmpcodecs/vf_zrmjpeg.c b/libmpcodecs/vf_zrmjpeg.c index 48b954ea80..4e33409585 100644 --- a/libmpcodecs/vf_zrmjpeg.c +++ b/libmpcodecs/vf_zrmjpeg.c @@ -505,6 +505,8 @@ static jpeg_enc_t *jpeg_enc_init(int w, int h, int y_rsize, // Which DCT method to use. AUTO will select the fastest one j->s->avctx->dct_algo = FF_DCT_AUTO; j->s->intra_quant_bias= 1<<(QUANT_BIAS_SHIFT-1); //(a + x/2)/x + // indicate we 'decode' to jpeg 4:2:2 + j->s->avctx->pix_fmt = PIX_FMT_YUVJ422P; j->s->avctx->thread_count = 1; diff --git a/libmpdemux/asf.h b/libmpdemux/asf.h index 1e6210e603..b97089bc15 100644 --- a/libmpdemux/asf.h +++ b/libmpdemux/asf.h @@ -1,3 +1,21 @@ +/* + * This file is part of MPlayer. + * + * MPlayer 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. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + #ifndef MPLAYER_ASF_H #define MPLAYER_ASF_H diff --git a/libmpdemux/asfheader.c b/libmpdemux/asfheader.c index 93f47877bc..c08ed17064 100644 --- a/libmpdemux/asfheader.c +++ b/libmpdemux/asfheader.c @@ -1,5 +1,22 @@ -// .asf fileformat docs from http://divx.euro.ru +/* + * This file is part of MPlayer. + * + * MPlayer 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. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ +// .asf fileformat docs from http://divx.euro.ru #include <stdio.h> #include <stdlib.h> diff --git a/libmpdemux/aviheader.c b/libmpdemux/aviheader.c index 516da9d0f8..3657e914b2 100644 --- a/libmpdemux/aviheader.c +++ b/libmpdemux/aviheader.c @@ -1,3 +1,20 @@ +/* + * This file is part of MPlayer. + * + * MPlayer 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. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ #include <stdio.h> #include <stdlib.h> diff --git a/libmpdemux/aviheader.h b/libmpdemux/aviheader.h index 2fd81d248a..66acc8fc3d 100644 --- a/libmpdemux/aviheader.h +++ b/libmpdemux/aviheader.h @@ -1,3 +1,21 @@ +/* + * This file is part of MPlayer. + * + * MPlayer 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. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + #ifndef MPLAYER_AVIHEADER_H #define MPLAYER_AVIHEADER_H diff --git a/libmpdemux/aviprint.c b/libmpdemux/aviprint.c index 35af2ffbdf..00461f6c9f 100644 --- a/libmpdemux/aviprint.c +++ b/libmpdemux/aviprint.c @@ -1,3 +1,20 @@ +/* + * This file is part of MPlayer. + * + * MPlayer 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. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ #include <stdio.h> #include <stdlib.h> diff --git a/libmpdemux/demux_aac.c b/libmpdemux/demux_aac.c index 88d9204615..ee9f1e935e 100644 --- a/libmpdemux/demux_aac.c +++ b/libmpdemux/demux_aac.c @@ -1,3 +1,21 @@ +/* + * This file is part of MPlayer. + * + * MPlayer 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. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/libmpdemux/demux_asf.c b/libmpdemux/demux_asf.c index b8be24f965..297c2018cb 100644 --- a/libmpdemux/demux_asf.c +++ b/libmpdemux/demux_asf.c @@ -1,4 +1,23 @@ -// ASF file parser for DEMUXER v0.3 by A'rpi/ESP-team +/* + * ASF file parser for DEMUXER v0.3 + * copyright (c) 2001 A'rpi/ESP-team + * + * This file is part of MPlayer. + * + * MPlayer 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. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ #include <stdio.h> #include <stdlib.h> diff --git a/libmpdemux/demux_audio.c b/libmpdemux/demux_audio.c index d374e3d130..da395fb611 100644 --- a/libmpdemux/demux_audio.c +++ b/libmpdemux/demux_audio.c @@ -1,3 +1,20 @@ +/* + * This file is part of MPlayer. + * + * MPlayer 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. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ #include "config.h" #include "mp_msg.h" diff --git a/libmpdemux/demux_avi.c b/libmpdemux/demux_avi.c index 8ef549cf42..197076adbe 100644 --- a/libmpdemux/demux_avi.c +++ b/libmpdemux/demux_avi.c @@ -1,4 +1,23 @@ -// AVI file parser for DEMUXER v2.9 by A'rpi/ESP-team +/* + * AVI file parser for DEMUXER v2.9 + * Copyright (c) 2001 A'rpi/ESP-team + * + * This file is part of MPlayer. + * + * MPlayer 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. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ #include <stdio.h> #include <stdlib.h> diff --git a/libmpdemux/demux_demuxers.c b/libmpdemux/demux_demuxers.c index 156251c33a..3d4c000bf4 100644 --- a/libmpdemux/demux_demuxers.c +++ b/libmpdemux/demux_demuxers.c @@ -1,3 +1,20 @@ +/* + * This file is part of MPlayer. + * + * MPlayer 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. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ #include "config.h" #include "mp_msg.h" diff --git a/libmpdemux/demux_film.c b/libmpdemux/demux_film.c index c310f3bd18..81b93fb4c4 100644 --- a/libmpdemux/demux_film.c +++ b/libmpdemux/demux_film.c @@ -1,14 +1,29 @@ /* - FILM file parser for the MPlayer program - by Mike Melanson - - This demuxer handles FILM (a.k.a. CPK) files commonly found on - Sega Saturn CD-ROM games. FILM files have also been found on 3DO - games. - - Details of the FILM file format can be found at: - http://www.pcisys.net/~melanson/codecs/ -*/ + * FILM file parser + * Copyright (C) 2002 Mike Melanson + * + * This demuxer handles FILM (a.k.a. CPK) files commonly found on Sega + * Saturn CD-ROM games. FILM files have also been found on 3DO games. + * + * details of the FILM file format can be found at: + * http://www.pcisys.net/~melanson/codecs/ + * + * This file is part of MPlayer. + * + * MPlayer 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. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ #include <stdio.h> #include <stdlib.h> diff --git a/libmpdemux/demux_fli.c b/libmpdemux/demux_fli.c index 37fa4d4559..bc00f4c0c2 100644 --- a/libmpdemux/demux_fli.c +++ b/libmpdemux/demux_fli.c @@ -1,7 +1,23 @@ /* - FLI file parser for the MPlayer program - by Mike Melanson -*/ + * FLI file parser + * copyright (c) 2001 Mike Melanson + * + * This file is part of MPlayer. + * + * MPlayer 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. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ #include <stdio.h> #include <stdlib.h> diff --git a/libmpdemux/demux_gif.c b/libmpdemux/demux_gif.c index 99aa134d92..419055896d 100644 --- a/libmpdemux/demux_gif.c +++ b/libmpdemux/demux_gif.c @@ -1,7 +1,23 @@ /* - GIF file parser for MPlayer - by Joey Parrish -*/ + * GIF file parser + * Copyright (C) 2003 Joey Parrish + * + * This file is part of MPlayer. + * + * MPlayer 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. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ #include <stdio.h> #include <stdlib.h> diff --git a/libmpdemux/demux_lmlm4.c b/libmpdemux/demux_lmlm4.c index 9b4382ba5a..9bd770adf3 100644 --- a/libmpdemux/demux_lmlm4.c +++ b/libmpdemux/demux_lmlm4.c @@ -1,7 +1,23 @@ /* - LMLM4 MPEG4 Compression Card stream & file parser by Maxim Yevtyushkin <max@linuxmedialabs.com> - Based on SMJPEG file parser by Alex Beregszaszi - + * LMLM4 MPEG4 Compression Card stream & file parser + * Copyright (C) 2003 Maxim Yevtyushkin <max@linuxmedialabs.com> + * based on SMJPEG file parser by Alex Beregszaszi + * + * This file is part of MPlayer. + * + * MPlayer 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. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #include <stdio.h> diff --git a/libmpdemux/demux_mf.c b/libmpdemux/demux_mf.c index dc990c0b8f..4f6f78c942 100644 --- a/libmpdemux/demux_mf.c +++ b/libmpdemux/demux_mf.c @@ -1,3 +1,20 @@ +/* + * This file is part of MPlayer. + * + * MPlayer 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. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ #include <stdio.h> #include <stdlib.h> diff --git a/libmpdemux/demux_mkv.c b/libmpdemux/demux_mkv.c index c8dfd92ba1..d4ba0d0227 100644 --- a/libmpdemux/demux_mkv.c +++ b/libmpdemux/demux_mkv.c @@ -1,9 +1,24 @@ /* - * native Matroska demuxer - * Written by Aurelien Jacobs <aurel@gnuage.org> + * Matroska demuxer + * Copyright (C) 2004 Aurelien Jacobs <aurel@gnuage.org> * Based on the one written by Ronald Bultje for gstreamer - * and on demux_mkv.cpp from Moritz Bunkus. - * Licence: GPL + * and on demux_mkv.cpp from Moritz Bunkus. + * + * This file is part of MPlayer. + * + * MPlayer 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. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #include "config.h" diff --git a/libmpdemux/demux_mov.c b/libmpdemux/demux_mov.c index bb05aaeae0..e345598469 100644 --- a/libmpdemux/demux_mov.c +++ b/libmpdemux/demux_mov.c @@ -1,22 +1,43 @@ -// QuickTime MOV file parser by A'rpi -// additional work by Atmos -// based on TOOLS/movinfo.c by A'rpi & Al3x -// compressed header support from moov.c of the openquicktime lib. -// References: http://openquicktime.sf.net/, http://www.heroinewarrior.com/ -// http://www.geocities.com/SiliconValley/Lakes/2160/fformats/files/mov.pdf -// (above url no longer works, file mirrored somewhere? ::atmos) -// The QuickTime File Format PDF from Apple: -// http://developer.apple.com/techpubs/quicktime/qtdevdocs/PDF/QTFileFormat.pdf -// (Complete list of documentation at http://developer.apple.com/quicktime/) -// MP4-Lib sources from http://mpeg4ip.sf.net/ might be useful for .mp4 -// as well as .mov specific stuff. -// All sort of Stuff about MPEG4: -// http://www.cmlab.csie.ntu.edu.tw/~pkhsiao/thesis.html -// I really recommend N4270-1.doc and N4270-2.doc which are exact specs -// of the MP4-File Format and the MPEG4 Specific extensions. ::atmos -// TSGS#15(02)0088 -// http://www.3gpp.org/ftp/tsg_sa/TSG_SA/TSGS_15/Docs/pdf/SP-020088.pdf -// http://www.3gpp2.org/Public_html/specs/C.S0050-0_v1.0_121503.pdf +/* + * QuickTime MOV file parser + * copyright(c) 2001 A'rpi + * additional work by Atmos + * based on TOOLS/movinfo.c by A'rpi & Al3x + * compressed header support from moov.c of the openquicktime lib. + * + * references: http://openquicktime.sf.net/, http://www.heroinewarrior.com/ + * http://www.geocities.com/SiliconValley/Lakes/2160/fformats/files/mov.pdf + * (above URL no longer works, file mirrored somewhere? ::atmos) + * The QuickTime File Format PDF from Apple: + * http://developer.apple.com/techpubs/quicktime/qtdevdocs/PDF/QTFileFormat.pdf + * (Complete list of documentation at http://developer.apple.com/quicktime/) + * MP4-Lib sources from http://mpeg4ip.sf.net/ might be useful for .mp4 + * as well as .mov specific stuff. + * + * All sort of Stuff about MPEG4: + * http://www.cmlab.csie.ntu.edu.tw/~pkhsiao/thesis.html + * I really recommend N4270-1.doc and N4270-2.doc which are exact specs + * of the MP4-File Format and the MPEG4 Specific extensions. ::atmos + * TSGS#15(02)0088 + * http://www.3gpp.org/ftp/tsg_sa/TSG_SA/TSGS_15/Docs/pdf/SP-020088.pdf + * http://www.3gpp2.org/Public_html/specs/C.S0050-0_v1.0_121503.pdf + * + * This file is part of MPlayer. + * + * MPlayer 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. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ #include <stdio.h> #include <stdlib.h> diff --git a/libmpdemux/demux_mpc.c b/libmpdemux/demux_mpc.c index b4e244f2de..dee3b5c8dd 100644 --- a/libmpdemux/demux_mpc.c +++ b/libmpdemux/demux_mpc.c @@ -1,8 +1,25 @@ -/** - * Demuxer for Musepack v7 bitstream - * by Reimar Doeffinger <Reimar.Doeffinger@stud.uni-karlsruhe.de> +/* + * demuxer for Musepack v7 bitstream + * copyright (c) 2005 Reimar Doeffinger <Reimar.Doeffinger@stud.uni-karlsruhe.de> + * * This code may be be relicensed under the terms of the GNU LGPL when it * becomes part of the FFmpeg project (ffmpeg.org) + * + * This file is part of MPlayer. + * + * MPlayer 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. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #include "config.h" diff --git a/libmpdemux/demux_mpg.c b/libmpdemux/demux_mpg.c index 620b44598c..248dac4393 100644 --- a/libmpdemux/demux_mpg.c +++ b/libmpdemux/demux_mpg.c @@ -1,4 +1,23 @@ -// MPG/VOB file parser for DEMUXER v2.5 by A'rpi/ESP-team +/* + * MPG/VOB file parser for DEMUXER v2.5 + * copyright (c) 2001 by A'rpi/ESP-team + * + * This file is part of MPlayer. + * + * MPlayer 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. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ #include <stdio.h> #include <stdlib.h> diff --git a/libmpdemux/demux_nsv.c b/libmpdemux/demux_nsv.c index eae192cd3c..9d3b1eceb0 100644 --- a/libmpdemux/demux_nsv.c +++ b/libmpdemux/demux_nsv.c @@ -1,12 +1,26 @@ - /* * Nullsoft Streaming Video demuxer - * for MPlayer - * by Reza Jelveh <reza.jelveh@tuhh.de> + * copyright (c) 2004 by Reza Jelveh <reza.jelveh@tuhh.de> + * Based on A'rpis G2 work + * * seeking and PCM audio not yet supported * PCM needs extra audio chunk "miniheader" parsing - * Based on A'rpis G2 work - * Licence: GPL + * + * This file is part of MPlayer. + * + * MPlayer 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. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #include <stdio.h> diff --git a/libmpdemux/demux_nut.c b/libmpdemux/demux_nut.c index d7bb2e8e6c..7054b0d054 100644 --- a/libmpdemux/demux_nut.c +++ b/libmpdemux/demux_nut.c @@ -1,3 +1,21 @@ +/* + * This file is part of MPlayer. + * + * MPlayer 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. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + #include <stdio.h> #include <stdlib.h> diff --git a/libmpdemux/demux_ogg.c b/libmpdemux/demux_ogg.c index 013bff5a76..3afcc97c3e 100644 --- a/libmpdemux/demux_ogg.c +++ b/libmpdemux/demux_ogg.c @@ -1,3 +1,20 @@ +/* + * This file is part of MPlayer. + * + * MPlayer 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. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ #include "config.h" diff --git a/libmpdemux/demux_pva.c b/libmpdemux/demux_pva.c index af16f1c3da..1cf3bf0c8e 100644 --- a/libmpdemux/demux_pva.c +++ b/libmpdemux/demux_pva.c @@ -1,20 +1,31 @@ /* - * demuxer for PVA files, such as the ones produced by software to manage DVB boards - * like the Hauppauge WinTV DVBs, for MPlayer. + * demuxer for PVA files, such as the ones produced by software to manage + * DVB boards like the Hauppauge WinTV DVBs + * copyright (c) 2002 Matteo Giani * * Uses info from the PVA file specifications found at - * * http://www.technotrend.de/download/av_format_v1.pdf - * - * WARNING: Quite a hack was required in order to get files by MultiDec played back correctly. - * If it breaks anything else, just comment out the "#define DEMUX_PVA_MULTIDEC_HACK" below - * and it will not be compiled in. * - * Feedback is appreciated. + * This file is part of MPlayer. * - * written by Matteo Giani + * MPlayer 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. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +/* WARNING: Quite a hack was required in order to get files by MultiDec + * played back correctly. If it breaks anything else, just comment out + * the #define below and it will not be compiled in. */ #define DEMUX_PVA_MULTIDEC_HACK #define PVA_NEW_PREBYTES_CODE diff --git a/libmpdemux/demux_rawaudio.c b/libmpdemux/demux_rawaudio.c index 5e4ce8f84f..769f9be519 100644 --- a/libmpdemux/demux_rawaudio.c +++ b/libmpdemux/demux_rawaudio.c @@ -1,3 +1,20 @@ +/* + * This file is part of MPlayer. + * + * MPlayer 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. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ #include "config.h" diff --git a/libmpdemux/demux_rawdv.c b/libmpdemux/demux_rawdv.c index 503a906fe1..69a99deca1 100644 --- a/libmpdemux/demux_rawdv.c +++ b/libmpdemux/demux_rawdv.c @@ -1,10 +1,24 @@ /* - raw dv file parser for MPlayer - by Alexander Neundorf <neundorf@kde.org> - based on the fli demuxer - - LGPL -*/ + * raw DV file parser + * copyright (c) 2002 Alexander Neundorf <neundorf@kde.org> + * based on the fli demuxer + * + * This file is part of MPlayer. + * + * MPlayer is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * MPlayer 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with MPlayer; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ #include <stdio.h> #include <stdlib.h> diff --git a/libmpdemux/demux_rawvideo.c b/libmpdemux/demux_rawvideo.c index 8f0e882e73..e84caafd01 100644 --- a/libmpdemux/demux_rawvideo.c +++ b/libmpdemux/demux_rawvideo.c @@ -1,3 +1,20 @@ +/* + * This file is part of MPlayer. + * + * MPlayer 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. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ #include "config.h" diff --git a/libmpdemux/demux_real.c b/libmpdemux/demux_real.c index 5c4497e4e5..eb4af6280b 100644 --- a/libmpdemux/demux_real.c +++ b/libmpdemux/demux_real.c @@ -1,24 +1,38 @@ /* - Real parser & demuxer - - (C) Alex Beregszaszi - (C) 2005, 2006 Roberto Togni - - Based on FFmpeg's libav/rm.c. - -Audio codecs: (supported by RealPlayer8 for Linux) - DNET - RealAudio 3.0, really it's AC3 in swapped-byteorder - SIPR - SiproLab's audio codec, ACELP decoder working with MPlayer, - needs fine-tuning too :) - ATRC - RealAudio 8 (ATRAC3) - www.minidisc.org/atrac3_article.pdf, - ACM decoder uploaded, needs some fine-tuning to work - -> RealAudio 8 - COOK/COKR - Real Cooker -> RealAudio G2 - -Video codecs: (supported by RealPlayer8 for Linux) - RV10 - H.263 based, working with libavcodec's decoder - RV20-RV40 - using RealPlayer's codec plugins -*/ + * Real parser & demuxer + * copyright (C) 2001 Alex Beregszaszi + * copyright (C) 2005, 2006 Roberto Togni + * based on FFmpeg's libav/rm.c + * + * audio codecs: (supported by RealPlayer8 for Linux) + * DNET - RealAudio 3.0, really it's AC3 in swapped-byteorder + * SIPR - SiproLab's audio codec, ACELP decoder working with MPlayer, + * needs fine-tuning too :) + * ATRC - RealAudio 8 (ATRAC3) - www.minidisc.org/atrac3_article.pdf, + * ACM decoder uploaded, needs some fine-tuning to work + * -> RealAudio 8 + * COOK/COKR - Real Cooker -> RealAudio G2 + * + * video codecs: (supported by RealPlayer8 for Linux) + * RV10 - H.263 based, working with libavcodec's decoder + * RV20-RV40 - using RealPlayer's codec plugins + * + * This file is part of MPlayer. + * + * MPlayer 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. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ #include <stdio.h> #include <stdlib.h> @@ -1113,7 +1127,7 @@ static demuxer_t* demux_open_real(demuxer_t* demuxer) mp_msg(MSGT_DEMUX,MSGL_V, "Chunk: %.4s (%x) (size: 0x%x, offset: 0x%x)\n", (char *)&chunk_id, chunk_id, chunk_size, chunk_pos); - if (chunk_size < 10){ + if (chunk_id != MKTAG('D', 'A', 'T', 'A') && chunk_size < 10){ mp_msg(MSGT_DEMUX,MSGL_ERR,"demux_real: invalid chunksize! (%d)\n",chunk_size); break; //return; } diff --git a/libmpdemux/demux_realaud.c b/libmpdemux/demux_realaud.c index 57226fa2d3..ce7683cc89 100644 --- a/libmpdemux/demux_realaud.c +++ b/libmpdemux/demux_realaud.c @@ -1,7 +1,23 @@ /* - Realaudio demuxer for MPlayer - (c) 2003, 2005 Roberto Togni -*/ + * Realaudio demuxer + * copyright (c) 2003, 2005 Roberto Togni + * + * This file is part of MPlayer. + * + * MPlayer 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. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ #include <stdio.h> #include <stdlib.h> diff --git a/libmpdemux/demux_roq.c b/libmpdemux/demux_roq.c index 0dfd7f544b..92123ea32b 100644 --- a/libmpdemux/demux_roq.c +++ b/libmpdemux/demux_roq.c @@ -1,9 +1,25 @@ /* - RoQ file demuxer for the MPlayer program - by Mike Melanson - based on Dr. Tim Ferguson's RoQ document found at: - http://www.csse.monash.edu.au/~timf/videocodec.html -*/ + * RoQ file demuxer + * copyright (c) 2002 Mike Melanson + * based on Dr. Tim Ferguson's RoQ document found at: + * http://www.csse.monash.edu.au/~timf/videocodec.html + * + * This file is part of MPlayer. + * + * MPlayer 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. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ #include <stdio.h> #include <stdlib.h> diff --git a/libmpdemux/demux_rtp.cpp b/libmpdemux/demux_rtp.cpp index fd6dffa0e3..1cc6a7c868 100644 --- a/libmpdemux/demux_rtp.cpp +++ b/libmpdemux/demux_rtp.cpp @@ -1,5 +1,23 @@ -////////// Routines (with C-linkage) that interface between "MPlayer" -////////// and the "LIVE555 Streaming Media" libraries: +/* + * routines (with C-linkage) that interface between MPlayer + * and the "LIVE555 Streaming Media" libraries + * + * This file is part of MPlayer. + * + * MPlayer 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. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ extern "C" { // on MinGW, we must include windows.h before the things it conflicts diff --git a/libmpdemux/demux_rtp.h b/libmpdemux/demux_rtp.h index b60ec54fe1..0e2c665ae8 100644 --- a/libmpdemux/demux_rtp.h +++ b/libmpdemux/demux_rtp.h @@ -1,3 +1,21 @@ +/* + * This file is part of MPlayer. + * + * MPlayer 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. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + #ifndef MPLAYER_DEMUX_RTP_H #define MPLAYER_DEMUX_RTP_H diff --git a/libmpdemux/demux_rtp_codec.cpp b/libmpdemux/demux_rtp_codec.cpp index 15d9fd0be4..35dbe3fb95 100644 --- a/libmpdemux/demux_rtp_codec.cpp +++ b/libmpdemux/demux_rtp_codec.cpp @@ -1,5 +1,23 @@ -////////// Codec-specific routines used to interface between "MPlayer" -////////// and the "LIVE555 Streaming Media" libraries: +/* + * codec-specific routines used to interface between MPlayer + * and the "LIVE555 Streaming Media" libraries + * + * This file is part of MPlayer. + * + * MPlayer 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. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ #include "demux_rtp_internal.h" extern "C" { diff --git a/libmpdemux/demux_rtp_internal.h b/libmpdemux/demux_rtp_internal.h index d504b49c7d..77f0364918 100644 --- a/libmpdemux/demux_rtp_internal.h +++ b/libmpdemux/demux_rtp_internal.h @@ -1,3 +1,21 @@ +/* + * This file is part of MPlayer. + * + * MPlayer 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. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + #ifndef MPLAYER_DEMUX_RTP_INTERNAL_H #define MPLAYER_DEMUX_RTP_INTERNAL_H diff --git a/libmpdemux/demux_smjpeg.c b/libmpdemux/demux_smjpeg.c index 205ab98459..199f81e62e 100644 --- a/libmpdemux/demux_smjpeg.c +++ b/libmpdemux/demux_smjpeg.c @@ -1,12 +1,25 @@ /* - SMJPEG file parser by Alex Beregszaszi - - Only for testing some files. - Commited only for Nexus' request. - - Based on text by Arpi (SMJPEG-format.txt) and later on - http://www.lokigames.com/development/download/smjpeg/SMJPEG.txt -*/ + * SMJPEG file parser + * copyright (c) 2002 Alex Beregszaszi + * based on text by Arpi (SMJPEG-format.txt) and later on + * http://www.lokigames.com/development/download/smjpeg/SMJPEG.txt + * + * This file is part of MPlayer. + * + * MPlayer 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. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ #include <stdio.h> #include <stdlib.h> diff --git a/libmpdemux/demux_ts.c b/libmpdemux/demux_ts.c index 33ffcdb689..3f30680181 100644 --- a/libmpdemux/demux_ts.c +++ b/libmpdemux/demux_ts.c @@ -5,22 +5,23 @@ * Kind feedback is appreciated; 'sucks' and alike is not. * Originally based on demux_pva.c written by Matteo Giani and FFmpeg (libavformat) sources * - * This file 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 file is part of MPlayer. * - * This file is distributed in the hope that it will be useful, + * MPlayer 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. + * + * MPlayer 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 - * Lesser General Public License for more details. + * 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 Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * You should have received a copy of the GNU General Public License along + * with MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ - #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/libmpdemux/demux_viv.c b/libmpdemux/demux_viv.c index 6db7276b41..19e98165f0 100644 --- a/libmpdemux/demux_viv.c +++ b/libmpdemux/demux_viv.c @@ -1,5 +1,24 @@ -// VIVO file parser by A'rpi -// VIVO text header parser and audio support by alex +/* + * VIVO file parser + * copyright (c) 2001 A'rpi + * VIVO text header parser and audio support by alex + * + * This file is part of MPlayer. + * + * MPlayer 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. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ #include <stdio.h> #include <stdlib.h> diff --git a/libmpdemux/demux_vqf.c b/libmpdemux/demux_vqf.c index 3aefa02dd9..2c841fa5d7 100644 --- a/libmpdemux/demux_vqf.c +++ b/libmpdemux/demux_vqf.c @@ -1,3 +1,21 @@ +/* + * This file is part of MPlayer. + * + * MPlayer 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. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + #include "config.h" #include <stdlib.h> diff --git a/libmpdemux/demux_y4m.c b/libmpdemux/demux_y4m.c index 4479a36ff3..7d2d82b98f 100644 --- a/libmpdemux/demux_y4m.c +++ b/libmpdemux/demux_y4m.c @@ -1,6 +1,26 @@ -// Y4M file parser by Rik Snel (using yuv4mpeg*.[ch] from -// mjpeg.sourceforge.net) (derived from demux_viv.c) -// older YUV4MPEG (used by xawtv) support by Alex Beregszaszi +/* + * Y4M file parser + * copyright (c) 2001 Rik Snel + * (using yuv4mpeg*.[ch] from mjpeg.sourceforge.net) + * (derived from demux_viv.c) + * older YUV4MPEG (used by xawtv) support by Alex Beregszaszi + * + * This file is part of MPlayer. + * + * MPlayer 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. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ #include <stdio.h> #include <stdlib.h> diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index 46662cb926..3e01f25ebd 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -1,4 +1,22 @@ -//=================== DEMUXER v2.5 ========================= +/* + * DEMUXER v2.5 + * + * This file is part of MPlayer. + * + * MPlayer 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. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ #include <stdio.h> #include <stdlib.h> diff --git a/libmpdemux/demuxer.h b/libmpdemux/demuxer.h index 544afe8add..ee1cd2cce5 100644 --- a/libmpdemux/demuxer.h +++ b/libmpdemux/demuxer.h @@ -1,3 +1,21 @@ +/* + * This file is part of MPlayer. + * + * MPlayer 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. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + #ifndef MPLAYER_DEMUXER_H #define MPLAYER_DEMUXER_H diff --git a/libmpdemux/ebml.c b/libmpdemux/ebml.c index 756d1713ce..a007bd4ad4 100644 --- a/libmpdemux/ebml.c +++ b/libmpdemux/ebml.c @@ -1,8 +1,23 @@ /* * native ebml reader for the Matroska demuxer - * Written by Aurelien Jacobs <aurel@gnuage.org> - * Based on the one written by Ronald Bultje for gstreamer - * Licence: GPL + * copyright (c) 2004 Aurelien Jacobs <aurel@gnuage.org> + * based on the one written by Ronald Bultje for gstreamer + * + * This file is part of MPlayer. + * + * MPlayer 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. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #include "config.h" diff --git a/libmpdemux/ebml.h b/libmpdemux/ebml.h index 345f08b46a..4faf2495f1 100644 --- a/libmpdemux/ebml.h +++ b/libmpdemux/ebml.h @@ -1,3 +1,21 @@ +/* + * This file is part of MPlayer. + * + * MPlayer 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. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + #ifndef MPLAYER_EBML_H #define MPLAYER_EBML_H diff --git a/libmpdemux/extension.c b/libmpdemux/extension.c index 3c0ad66cf7..dc20214b87 100644 --- a/libmpdemux/extension.c +++ b/libmpdemux/extension.c @@ -1,3 +1,20 @@ +/* + * This file is part of MPlayer. + * + * MPlayer 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. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ #include <stdio.h> #include <stdlib.h> diff --git a/libmpdemux/matroska.h b/libmpdemux/matroska.h index ab0e999914..3e4a404f38 100644 --- a/libmpdemux/matroska.h +++ b/libmpdemux/matroska.h @@ -2,6 +2,22 @@ * CodecID definitions for Matroska files * * see http://cvs.corecodec.org/cgi-bin/cvsweb.cgi/~checkout~/matroska/doc/website/specs/codex.html?rev=HEAD&content-type=text/html + * + * This file is part of MPlayer. + * + * MPlayer 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. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #ifndef MPLAYER_MATROSKA_H diff --git a/libmpdemux/mf.c b/libmpdemux/mf.c index 4d19fdb43c..06e877845a 100644 --- a/libmpdemux/mf.c +++ b/libmpdemux/mf.c @@ -1,3 +1,20 @@ +/* + * This file is part of MPlayer. + * + * MPlayer 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. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ #include <ctype.h> #include <stdio.h> diff --git a/libmpdemux/mf.h b/libmpdemux/mf.h index fe104f47b3..dd461bc97c 100644 --- a/libmpdemux/mf.h +++ b/libmpdemux/mf.h @@ -1,3 +1,20 @@ +/* + * This file is part of MPlayer. + * + * MPlayer 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. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ #ifndef MPLAYER_MF_H #define MPLAYER_MF_H diff --git a/libmpdemux/mp3_hdr.c b/libmpdemux/mp3_hdr.c index da1826215c..31d58b4eee 100644 --- a/libmpdemux/mp3_hdr.c +++ b/libmpdemux/mp3_hdr.c @@ -1,3 +1,21 @@ +/* + * This file is part of MPlayer. + * + * MPlayer 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. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + #include <stdio.h> #include "config.h" diff --git a/libmpdemux/mp3_hdr.h b/libmpdemux/mp3_hdr.h index 3e6fb7f6bd..ebd3fe9e80 100644 --- a/libmpdemux/mp3_hdr.h +++ b/libmpdemux/mp3_hdr.h @@ -1,3 +1,21 @@ +/* + * This file is part of MPlayer. + * + * MPlayer 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. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + #ifndef MPLAYER_MP3_HDR_H #define MPLAYER_MP3_HDR_H diff --git a/libmpdemux/mpeg_hdr.c b/libmpdemux/mpeg_hdr.c index 3e4bbfe31b..4b586af158 100644 --- a/libmpdemux/mpeg_hdr.c +++ b/libmpdemux/mpeg_hdr.c @@ -1,5 +1,22 @@ - -// based on libmpeg2/header.c by Aaron Holtzman <aholtzma@ess.engr.uvic.ca> +/* + * based on libmpeg2/header.c by Aaron Holtzman <aholtzma@ess.engr.uvic.ca> + * + * This file is part of MPlayer. + * + * MPlayer 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. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ #include <inttypes.h> #include <stdio.h> diff --git a/libmpdemux/mpeg_hdr.h b/libmpdemux/mpeg_hdr.h index dc2c1646d8..cb9aef1625 100644 --- a/libmpdemux/mpeg_hdr.h +++ b/libmpdemux/mpeg_hdr.h @@ -1,3 +1,21 @@ +/* + * This file is part of MPlayer. + * + * MPlayer 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. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + #ifndef MPLAYER_MPEG_HDR_H #define MPLAYER_MPEG_HDR_H diff --git a/libmpdemux/ms_hdr.h b/libmpdemux/ms_hdr.h index 89f95ecbc3..87d0bf6e58 100644 --- a/libmpdemux/ms_hdr.h +++ b/libmpdemux/ms_hdr.h @@ -1,3 +1,21 @@ +/* + * This file is part of MPlayer. + * + * MPlayer 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. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + #ifndef MPLAYER_MS_HDR_H #define MPLAYER_MS_HDR_H diff --git a/libmpdemux/muxer.c b/libmpdemux/muxer.c index 858c21546b..5a452f3ff8 100644 --- a/libmpdemux/muxer.c +++ b/libmpdemux/muxer.c @@ -1,3 +1,20 @@ +/* + * This file is part of MPlayer. + * + * MPlayer 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. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ #include <stdio.h> #include <stdlib.h> diff --git a/libmpdemux/muxer.h b/libmpdemux/muxer.h index 68bdedcfd3..48b132b85f 100644 --- a/libmpdemux/muxer.h +++ b/libmpdemux/muxer.h @@ -1,3 +1,21 @@ +/* + * This file is part of MPlayer. + * + * MPlayer 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. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + #ifndef MPLAYER_MUXER_H #define MPLAYER_MUXER_H diff --git a/libmpdemux/muxer_avi.c b/libmpdemux/muxer_avi.c index 6eab6fc569..790625d419 100644 --- a/libmpdemux/muxer_avi.c +++ b/libmpdemux/muxer_avi.c @@ -1,3 +1,21 @@ +/* + * This file is part of MPlayer. + * + * MPlayer 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. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/libmpdemux/muxer_lavf.c b/libmpdemux/muxer_lavf.c index f208d52df0..a42fbd09bb 100644 --- a/libmpdemux/muxer_lavf.c +++ b/libmpdemux/muxer_lavf.c @@ -1,3 +1,21 @@ +/* + * This file is part of MPlayer. + * + * MPlayer 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. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/libmpdemux/muxer_mpeg.c b/libmpdemux/muxer_mpeg.c index 9d00a7bdd1..1a3c8a2270 100644 --- a/libmpdemux/muxer_mpeg.c +++ b/libmpdemux/muxer_mpeg.c @@ -1,3 +1,20 @@ +/* + * This file is part of MPlayer. + * + * MPlayer 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. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ #include <stdio.h> #include <stdlib.h> diff --git a/libmpdemux/muxer_rawaudio.c b/libmpdemux/muxer_rawaudio.c index 69abf8200b..341999ee1d 100644 --- a/libmpdemux/muxer_rawaudio.c +++ b/libmpdemux/muxer_rawaudio.c @@ -1,3 +1,21 @@ +/* + * This file is part of MPlayer. + * + * MPlayer 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. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/libmpdemux/muxer_rawvideo.c b/libmpdemux/muxer_rawvideo.c index b5c25aff0a..c4ed4ba22a 100644 --- a/libmpdemux/muxer_rawvideo.c +++ b/libmpdemux/muxer_rawvideo.c @@ -1,3 +1,20 @@ +/* + * This file is part of MPlayer. + * + * MPlayer 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. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ #include <stdio.h> #include <stdlib.h> diff --git a/libmpdemux/parse_es.c b/libmpdemux/parse_es.c index d907d28422..543d5531fa 100644 --- a/libmpdemux/parse_es.c +++ b/libmpdemux/parse_es.c @@ -1,4 +1,22 @@ -//=================== MPEG-ES VIDEO PARSER ========================= +/* + * MPEG-ES video parser + * + * This file is part of MPlayer. + * + * MPlayer 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. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ #include <stdio.h> #include <stdlib.h> diff --git a/libmpdemux/parse_es.h b/libmpdemux/parse_es.h index b562aff04e..ea2405a803 100644 --- a/libmpdemux/parse_es.h +++ b/libmpdemux/parse_es.h @@ -1,3 +1,21 @@ +/* + * This file is part of MPlayer. + * + * MPlayer 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. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + #ifndef MPLAYER_PARSE_ES_H #define MPLAYER_PARSE_ES_H diff --git a/libmpdemux/qtpalette.h b/libmpdemux/qtpalette.h index d2e3a33c5a..69026eae0e 100644 --- a/libmpdemux/qtpalette.h +++ b/libmpdemux/qtpalette.h @@ -1,6 +1,24 @@ -// Default Palettes for Quicktime Files -// Automatically generated from a utility derived from XAnim: -// http://xanim.va.pubnix.com/home.html +/* + * default palettes for QuickTime files + * Automatically generated from a utility derived from XAnim: + * http://xanim.va.pubnix.com/home.html + * + * This file is part of MPlayer. + * + * MPlayer 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. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ #ifndef MPLAYER_QTPALETTE_H #define MPLAYER_QTPALETTE_H diff --git a/libmpdemux/stheader.h b/libmpdemux/stheader.h index 12a9144fc6..f80cd2cf6a 100644 --- a/libmpdemux/stheader.h +++ b/libmpdemux/stheader.h @@ -1,3 +1,21 @@ +/* + * This file is part of MPlayer. + * + * MPlayer 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. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + #ifndef MPLAYER_STHEADER_H #define MPLAYER_STHEADER_H diff --git a/libmpdemux/video.c b/libmpdemux/video.c index 2d7e064202..4af3f75529 100644 --- a/libmpdemux/video.c +++ b/libmpdemux/video.c @@ -1,4 +1,22 @@ -// read video frame +/* + * video frame reading + * + * This file is part of MPlayer. + * + * MPlayer 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. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ #include "config.h" diff --git a/libmpdemux/yuv4mpeg.h b/libmpdemux/yuv4mpeg.h index 87b71140ea..fd4dba805a 100644 --- a/libmpdemux/yuv4mpeg.h +++ b/libmpdemux/yuv4mpeg.h @@ -77,7 +77,7 @@ extern const y4m_ratio_t y4m_fps_60; /* 60fps */ /************************************************************************ * useful standard sample (pixel) aspect ratios ************************************************************************/ -extern const y4m_ratio_t y4m_sar_UNKNOWN; +extern const y4m_ratio_t y4m_sar_UNKNOWN; extern const y4m_ratio_t y4m_sar_SQUARE; /* square pixels */ extern const y4m_ratio_t y4m_sar_NTSC_CCIR601; /* 525-line (NTSC) Rec.601 */ extern const y4m_ratio_t y4m_sar_NTSC_16_9; /* 16:9 NTSC/Rec.601 */ @@ -202,12 +202,12 @@ const char *y4m_xtag_get(const y4m_xtag_list_t *xtags, int n); Y4M_ERR_XXTAGS - list is already full */ int y4m_xtag_add(y4m_xtag_list_t *xtags, const char *tag); -/* remove a tag from an xtag_list +/* remove a tag from an xtag_list returns: Y4M_OK - success Y4M_ERR_RANGE - n is out of range */ int y4m_xtag_remove(y4m_xtag_list_t *xtags, int n); -/* remove all tags from an xtag_list +/* remove all tags from an xtag_list returns: Y4M_OK - success */ int y4m_xtag_clearlist(y4m_xtag_list_t *xtags); @@ -294,7 +294,7 @@ ssize_t y4m_write(int fd, char *buf, size_t len); /************************************************************************ * stream header processing functions - * + * * o return values: * Y4M_OK - success * Y4M_ERR_* - error (see y4m_strerr() for descriptions) @@ -315,7 +315,7 @@ int y4m_write_stream_header(int fd, y4m_stream_info_t *i); /************************************************************************ * frame processing functions - * + * * o return values: * Y4M_OK - success * Y4M_ERR_* - error (see y4m_strerr() for descriptions) @@ -332,13 +332,13 @@ int y4m_write_frame_header(int fd, y4m_frame_info_t *i); /* read a complete frame (header + data) o yuv[3] points to three buffers, one each for Y, U, V planes */ -int y4m_read_frame(stream_t *s, y4m_stream_info_t *si, +int y4m_read_frame(stream_t *s, y4m_stream_info_t *si, y4m_frame_info_t *fi, unsigned char *yuv[3]); #if 0 /* write a complete frame (header + data) o yuv[3] points to three buffers, one each for Y, U, V planes */ -int y4m_write_frame(int fd, y4m_stream_info_t *si, +int y4m_write_frame(int fd, y4m_stream_info_t *si, y4m_frame_info_t *fi, unsigned char *yuv[3]); #endif @@ -349,7 +349,7 @@ int y4m_write_frame(int fd, y4m_stream_info_t *si, o lower_field[3] same as yuv[3] above, but for lower field */ int y4m_read_fields(int fd, y4m_stream_info_t *si, y4m_frame_info_t *fi, - unsigned char *upper_field[3], + unsigned char *upper_field[3], unsigned char *lower_field[3]); /* write a complete frame (header + data), but interleave fields @@ -358,7 +358,7 @@ int y4m_read_fields(int fd, y4m_stream_info_t *si, y4m_frame_info_t *fi, o lower_field[3] same as yuv[3] above, but for lower field */ int y4m_write_fields(int fd, y4m_stream_info_t *si, y4m_frame_info_t *fi, - unsigned char *upper_field[3], + unsigned char *upper_field[3], unsigned char *lower_field[3]); #endif diff --git a/libswscale/ppc/swscale_altivec_template.c b/libswscale/ppc/swscale_altivec_template.c index 0bf620bc83..c24970464c 100644 --- a/libswscale/ppc/swscale_altivec_template.c +++ b/libswscale/ppc/swscale_altivec_template.c @@ -85,8 +85,8 @@ altivec_packIntArrayToCharArray(int *val, uint8_t* dest, int dstW) { } static inline void -yuv2yuvX_altivec_real(int16_t *lumFilter, int16_t **lumSrc, int lumFilterSize, - int16_t *chrFilter, int16_t **chrSrc, int chrFilterSize, +yuv2yuvX_altivec_real(const int16_t *lumFilter, int16_t **lumSrc, int lumFilterSize, + const int16_t *chrFilter, int16_t **chrSrc, int chrFilterSize, uint8_t *dest, uint8_t *uDest, uint8_t *vDest, int dstW, int chrDstW) { const vector signed int vini = {(1 << 18), (1 << 18), (1 << 18), (1 << 18)}; @@ -208,7 +208,11 @@ yuv2yuvX_altivec_real(int16_t *lumFilter, int16_t **lumSrc, int lumFilterSize, } } -static inline void hScale_altivec_real(int16_t *dst, int dstW, uint8_t *src, int srcW, int xInc, int16_t *filter, int16_t *filterPos, int filterSize) { +static inline void hScale_altivec_real(int16_t *dst, int dstW, + const uint8_t *src, int srcW, + int xInc, const int16_t *filter, + const int16_t *filterPos, int filterSize) +{ register int i; int __attribute__ ((aligned (16))) tempo[4]; diff --git a/libswscale/ppc/yuv2rgb_altivec.c b/libswscale/ppc/yuv2rgb_altivec.c index dc5894cda5..43879ea62d 100644 --- a/libswscale/ppc/yuv2rgb_altivec.c +++ b/libswscale/ppc/yuv2rgb_altivec.c @@ -787,8 +787,8 @@ void ff_yuv2rgb_init_tables_altivec(SwsContext *c, const int inv_table[4], int b void ff_yuv2packedX_altivec(SwsContext *c, - int16_t *lumFilter, int16_t **lumSrc, int lumFilterSize, - int16_t *chrFilter, int16_t **chrSrc, int chrFilterSize, + const int16_t *lumFilter, int16_t **lumSrc, int lumFilterSize, + const int16_t *chrFilter, int16_t **chrSrc, int chrFilterSize, uint8_t *dest, int dstW, int dstY) { int i,j; diff --git a/libswscale/swscale.c b/libswscale/swscale.c index a0954ad845..31e3b83cde 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -1792,9 +1792,9 @@ static void globalInit(void){ static SwsFunc getSwsFunc(SwsContext *c) { +#if CONFIG_RUNTIME_CPUDETECT && CONFIG_GPL int flags = c->flags; -#if CONFIG_RUNTIME_CPUDETECT && CONFIG_GPL #if ARCH_X86 // ordered per speed fastest first if (flags & SWS_CPU_CAPS_MMX2) { @@ -2371,7 +2371,8 @@ static int handle_jpeg(enum PixelFormat *format) } SwsContext *sws_getContext(int srcW, int srcH, enum PixelFormat srcFormat, int dstW, int dstH, enum PixelFormat dstFormat, int flags, - SwsFilter *srcFilter, SwsFilter *dstFilter, double *param){ + SwsFilter *srcFilter, SwsFilter *dstFilter, const double *param) +{ SwsContext *c; int i; @@ -3400,7 +3401,7 @@ void sws_freeContext(SwsContext *c){ struct SwsContext *sws_getCachedContext(struct SwsContext *context, int srcW, int srcH, enum PixelFormat srcFormat, int dstW, int dstH, enum PixelFormat dstFormat, int flags, - SwsFilter *srcFilter, SwsFilter *dstFilter, double *param) + SwsFilter *srcFilter, SwsFilter *dstFilter, const double *param) { static const double default_param[2] = {SWS_PARAM_DEFAULT, SWS_PARAM_DEFAULT}; diff --git a/libswscale/swscale.h b/libswscale/swscale.h index 4990ebf134..f5856c381c 100644 --- a/libswscale/swscale.h +++ b/libswscale/swscale.h @@ -130,7 +130,7 @@ void sws_freeContext(struct SwsContext *swsContext); struct SwsContext *sws_getContext(int srcW, int srcH, enum PixelFormat srcFormat, int dstW, int dstH, enum PixelFormat dstFormat, int flags, SwsFilter *srcFilter, - SwsFilter *dstFilter, double *param); + SwsFilter *dstFilter, const double *param); /** * Scales the image slice in \p srcSlice and puts the resulting scaled @@ -258,6 +258,6 @@ struct SwsContext *sws_getCachedContext(struct SwsContext *context, int srcW, int srcH, enum PixelFormat srcFormat, int dstW, int dstH, enum PixelFormat dstFormat, int flags, SwsFilter *srcFilter, - SwsFilter *dstFilter, double *param); + SwsFilter *dstFilter, const double *param); #endif /* SWSCALE_SWSCALE_H */ diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h index eb11166e25..d9bbb6c1e2 100644 --- a/libswscale/swscale_internal.h +++ b/libswscale/swscale_internal.h @@ -289,8 +289,8 @@ SwsFunc ff_yuv2rgb_init_altivec(SwsContext *c); SwsFunc ff_yuv2rgb_get_func_ptr_bfin(SwsContext *c); void ff_bfin_get_unscaled_swscale(SwsContext *c); void ff_yuv2packedX_altivec(SwsContext *c, - int16_t *lumFilter, int16_t **lumSrc, int lumFilterSize, - int16_t *chrFilter, int16_t **chrSrc, int chrFilterSize, + const int16_t *lumFilter, int16_t **lumSrc, int lumFilterSize, + const int16_t *chrFilter, int16_t **chrSrc, int chrFilterSize, uint8_t *dest, int dstW, int dstY); const char *sws_format_name(int format); @@ -2,11 +2,11 @@ * decoder for Closed Captions * * This decoder relies on MPlayer's OSD to display subtitles. - * Be warned that the decoding is somewhat preliminary, though it basically works. - * - * Most notably, only the text information is decoded as of now, discarding color, - * background and position info (see source below). - * + * Be warned that decoding is somewhat preliminary, though it basically works. + * + * Most notably, only the text information is decoded as of now, discarding + * color, background and position info (see source below). + * * by Matteo Giani * * uses source from the xine closed captions decoder @@ -90,8 +90,8 @@ static void scroll_buffer(subtitle* buf) buf->lines--; } } - - + + void subcc_init(void) { int i; @@ -108,7 +108,7 @@ void subcc_init(void) static void append_char(char c) { if(!bb->lines) {bb->lines++; cursor_pos=0;} - if(bb->text[bb->lines - 1]==NULL) + if(bb->text[bb->lines - 1]==NULL) { bb->text[bb->lines - 1]=malloc(CC_MAX_LINE_LENGTH); memset(bb->text[bb->lines - 1],0,CC_MAX_LINE_LENGTH); @@ -126,7 +126,7 @@ static void append_char(char c) } } } - else + else { if(cursor_pos==CC_MAX_LINE_LENGTH-1) { @@ -157,7 +157,7 @@ static void display_buffer(subtitle * buf) static void cc_decode_EIA608(unsigned short int data) { - + static unsigned short int lastcode=0x0000; unsigned char c1 = data & 0x7f; unsigned char c2 = (data >> 8) & 0x7f; @@ -180,13 +180,13 @@ static void cc_decode_EIA608(unsigned short int data) switch(c1) { case 0x10: break; // ext attribute - case 0x11: - if((c2 & 0x30)==0x30) + case 0x11: + if((c2 & 0x30)==0x30) { //printf("[debug]:Special char (ignored)\n"); /*cc_decode_special_char()*/; } - else if (c2 & 0x20) + else if (c2 & 0x20) { //printf("[debug]: midrow_attr (ignored)\n"); /*cc_decode_midrow_attr()*/; @@ -223,8 +223,8 @@ static void cc_decode_EIA608(unsigned short int data) } } } - } - lastcode=data; + } + lastcode=data; } static void subcc_decode(unsigned char *inputbuffer, unsigned int inputlength) @@ -247,13 +247,13 @@ static void subcc_decode(unsigned char *inputbuffer, unsigned int inputlength) * 0x00 is padding, followed by 2 more 0x00. * * 0x01 always seems to appear at the beginning, always seems to - * be followed by 0xf8, 8-bit number. + * be followed by 0xf8, 8-bit number. * The lower 7 bits of this 8-bit number seem to denote the * number of code triplets that follow. - * The most significant bit denotes whether the Line 21 field 1 + * The most significant bit denotes whether the Line 21 field 1 * captioning information is at odd or even triplet offsets from this * beginning triplet. 1 denotes odd offsets, 0 denotes even offsets. - * + * * Most captions are encoded with odd offsets, so this is what we * will assume. * @@ -276,18 +276,18 @@ static void subcc_decode(unsigned char *inputbuffer, unsigned int inputlength) #endif break; } - + data1 = *(current+1); data2 = *(current + 2); current++; curbytes++; - + switch (cc_code) { case 0xfe: /* expect 2 byte encoding (perhaps CC3, CC4?) */ /* ignore for time being */ skip = 2; break; - + case 0xff: /* expect EIA-608 CC1/CC2 encoding */ // FIXME check parity! @@ -296,12 +296,12 @@ static void subcc_decode(unsigned char *inputbuffer, unsigned int inputlength) cc_decode_EIA608(data1 | (data2 << 8)); skip = 5; break; - + case 0x00: /* This seems to be just padding */ skip = 2; break; - + case 0x01: odd_offset = data2 & 0x80; if (odd_offset) @@ -309,7 +309,7 @@ static void subcc_decode(unsigned char *inputbuffer, unsigned int inputlength) else skip = 5; break; - + default: //#ifdef LOG_DEBUG fprintf(stderr, "Unknown CC encoding: %x\n", cc_code); diff --git a/subopt-helper.c b/subopt-helper.c index 6f4bcf6a30..50283cfbf3 100644 --- a/subopt-helper.c +++ b/subopt-helper.c @@ -1,4 +1,4 @@ -/** +/** * \file subopt-helper.c * * \brief Compensates the suboption parsing code duplication a bit. @@ -69,7 +69,7 @@ int subopt_parse( char const * const str, const opt_t * opts ) { char * delim, * arg_delim; - /* search nearest delimiter ( option or argument delimiter ) */ + /* search nearest delimiter ( option or argument delimiter ) */ delim = strchr( &str[parse_pos], ':' ); arg_delim = strchr( &str[parse_pos], '=' ); @@ -78,7 +78,7 @@ int subopt_parse( char const * const str, const opt_t * opts ) { delim = strchr( &str[parse_pos], '=' ); } - + substr_len = delim ? // is a delim present delim - &str[parse_pos] : // yes strlen( &str[parse_pos] ); // no, end of string @@ -204,7 +204,7 @@ else if ( substr_len == opt_len+2 ) /* break out of the loop, if this subopt is processed */ if ( next ) { break; } } - + /* if we had a valid suboption the current pos should * * equal the delimiter char, which should be ':' for * * suboptions. */ diff --git a/subreader.c b/subreader.c index 19e29491ca..86574316f5 100644 --- a/subreader.c +++ b/subreader.c @@ -53,7 +53,7 @@ int sub_match_fuzziness=0; // level of sub name matching fuzziness /* Use the SUB_* constant defined in the header file */ int sub_format=SUB_INVALID; #ifdef CONFIG_SORTSUB -/* +/* Some subtitling formats, namely AQT and Subrip09, define the end of a subtitle as the beginning of the following. Since currently we read one subtitle at time, for these format we keep two global *subtitle, @@ -114,7 +114,7 @@ static subtitle *sub_read_line_sami(stream_t* st, subtitle *current) { case 0: /* find "START=" or "Slacktime:" */ slacktime_s = stristr (s, "Slacktime:"); - if (slacktime_s) + if (slacktime_s) sub_slacktime = strtol (slacktime_s+10, NULL, 0) / 10; s = stristr (s, "Start="); @@ -126,7 +126,7 @@ static subtitle *sub_read_line_sami(stream_t* st, subtitle *current) { state = 1; continue; } break; - + case 1: /* find (optionnal) "<P", skip other TAGs */ for (; *s == ' ' || *s == '\t'; s++); /* strip blanks, if any */ if (*s == '\0') break; @@ -138,11 +138,11 @@ static subtitle *sub_read_line_sami(stream_t* st, subtitle *current) { break; s++; continue; - + case 2: /* find ">" */ if ((s = strchr (s, '>'))) { s++; state = 3; p = text; continue; } break; - + case 3: /* get all text until '<' appears */ if (*s == '\0') break; else if (!strncasecmp (s, "<br>", 4)) { @@ -160,7 +160,7 @@ static subtitle *sub_read_line_sami(stream_t* st, subtitle *current) { /* skip duplicated space */ if (p > text + 2) if (*(p-1) == ' ' && *(p-2) == ' ') p--; - + continue; case 4: /* get current->end or skip <TAG> */ @@ -221,7 +221,7 @@ static subtitle *sub_read_line_sami(stream_t* st, subtitle *current) { return 0; } } - + } while (state != 99); // For the last subtitle @@ -231,7 +231,7 @@ static subtitle *sub_read_line_sami(stream_t* st, subtitle *current) { if (text[0] != '\0') current->text[current->lines++] = strdup (text); } - + return current; } @@ -239,21 +239,21 @@ static subtitle *sub_read_line_sami(stream_t* st, subtitle *current) { static char *sub_readtext(char *source, char **dest) { int len=0; char *p=source; - + // printf("src=%p dest=%p \n",source,dest); while ( !eol(*p) && *p!= '|' ) { p++,len++; } - + *dest= malloc (len+1); if (!dest) {return ERR;} - + strncpy(*dest, source, len); (*dest)[len]=0; - + while (*p=='\r' || *p=='\n' || *p=='|') p++; - + if (*p) return p; // not-last text field else return NULL; // last text field } @@ -317,7 +317,7 @@ static subtitle *sub_read_line_subrip(stream_t* st, subtitle *current) { int a1,a2,a3,a4,b1,b2,b3,b4; char *p=NULL, *q=NULL; int len; - + while (1) { if (!stream_read_line (st, line, LINE_LEN)) return NULL; if (sscanf (line, "%d:%d:%d.%d,%d:%d:%d.%d",&a1,&a2,&a3,&a4,&b1,&b2,&b3,&b4) < 8) continue; @@ -347,7 +347,7 @@ static subtitle *sub_read_line_subviewer(stream_t *st,subtitle *current) { int a1,a2,a3,a4,b1,b2,b3,b4; char *p=NULL; int i,len; - + while (!current->text[0]) { if (!stream_read_line (st, line, LINE_LEN)) return NULL; if ((len=sscanf (line, "%d:%d:%d%[,.:]%d --> %d:%d:%d%[,.:]%d",&a1,&a2,&a3,(char *)&i,&a4,&b1,&b2,&b3,(char *)&i,&b4)) < 10) @@ -399,7 +399,7 @@ static subtitle *sub_read_line_subviewer2(stream_t *st,subtitle *current) { int a1,a2,a3,a4; char *p=NULL; int i,len; - + while (!current->text[0]) { if (!stream_read_line (st, line, LINE_LEN)) return NULL; if (line[0]!='{') @@ -443,11 +443,11 @@ static subtitle *sub_read_line_vplayer(stream_t *st,subtitle *current) { /* removed by wodzu p=line; // finds the body of the subtitle - for (i=0; i<3; i++){ + for (i=0; i<3; i++){ p=strchr(p,':'); if (p==NULL) break; ++p; - } + } if (p==NULL) { printf("SUB: Skipping incorrect subtitle line!\n"); continue; @@ -474,14 +474,14 @@ static subtitle *sub_read_line_vplayer(stream_t *st,subtitle *current) { } static subtitle *sub_read_line_rt(stream_t *st,subtitle *current) { - //TODO: This format uses quite rich (sub/super)set of xhtml + //TODO: This format uses quite rich (sub/super)set of xhtml // I couldn't check it since DTD is not included. - // WARNING: full XML parses can be required for proper parsing + // WARNING: full XML parses can be required for proper parsing char line[LINE_LEN+1]; int a1,a2,a3,a4,b1,b2,b3,b4; char *p=NULL,*next=NULL; int i,len,plen; - + while (!current->text[0]) { if (!stream_read_line (st, line, LINE_LEN)) return NULL; //TODO: it seems that format of time is not easily determined, it may be 1:12, 1:12.0 or 0:1:12.0 @@ -500,7 +500,7 @@ static subtitle *sub_read_line_rt(stream_t *st,subtitle *current) { ((len=sscanf (line, "<%*[tT]ime %*[bB]egin=\"%d.%d\"%*[^<]<clear/>%n",&a3,&a4,&plen)) < 2) && ((len=sscanf (line, "<%*[tT]ime %*[bB]egin=\"%d:%d\"%*[^<]<clear/>%n",&a2,&a3,&plen)) < 2) && ((len=sscanf (line, "<%*[tT]ime %*[bB]egin=\"%d:%d.%d\"%*[^<]<clear/>%n",&a2,&a3,&a4,&plen)) < 3) && - ((len=sscanf (line, "<%*[tT]ime %*[bB]egin=\"%d:%d:%d.%d\"%*[^<]<clear/>%n",&a1,&a2,&a3,&a4,&plen)) < 4) + ((len=sscanf (line, "<%*[tT]ime %*[bB]egin=\"%d:%d:%d.%d\"%*[^<]<clear/>%n",&a1,&a2,&a3,&a4,&plen)) < 4) ) continue; current->start = a1*360000+a2*6000+a3*100+a4/10; @@ -550,13 +550,13 @@ static subtitle *sub_read_line_ssa(stream_t *st,subtitle *current) { if (!stream_read_line (st, line, LINE_LEN)) return NULL; } while (sscanf (line, "Dialogue: Marked=%d,%d:%d:%d.%d,%d:%d:%d.%d," "%[^\n\r]", ¬hing, - &hour1, &min1, &sec1, &hunsec1, + &hour1, &min1, &sec1, &hunsec1, &hour2, &min2, &sec2, &hunsec2, line3) < 9 && sscanf (line, "Dialogue: %d,%d:%d:%d.%d,%d:%d:%d.%d," "%[^\n\r]", ¬hing, - &hour1, &min1, &sec1, &hunsec1, + &hour1, &min1, &sec1, &hunsec1, &hour2, &min2, &sec2, &hunsec2, line3) < 9 ); @@ -566,7 +566,7 @@ static subtitle *sub_read_line_ssa(stream_t *st,subtitle *current) { { tmp = line2; if(!(tmp=strchr(++tmp, ','))) break; - if(*(++tmp) == ' ') break; + if(*(++tmp) == ' ') break; /* a space after a comma means we're already in a sentence */ line2 = tmp; } @@ -673,9 +673,9 @@ static subtitle *sub_read_line_mpsub(stream_t *st, subtitle *current) { if (!stream_read_line(st, line, LINE_LEN)) return NULL; } while (sscanf (line, "%f %f", &a, &b) !=2); - mpsub_position += a*mpsub_multiplier; + mpsub_position += a*mpsub_multiplier; current->start=(int) mpsub_position; - mpsub_position += b*mpsub_multiplier; + mpsub_position += b*mpsub_multiplier; current->end=(int) mpsub_position; while (num < SUB_MAX_TEXT) { @@ -719,13 +719,13 @@ static subtitle *sub_read_line_aqt(stream_t *st,subtitle *current) { if (!(sscanf (line, "-->> %ld", &(current->start)) <1)) break; } - + #ifdef CONFIG_SORTSUB - previous_sub_end = (current->start) ? current->start - 1 : 0; + previous_sub_end = (current->start) ? current->start - 1 : 0; #else - if (previous_aqt_sub != NULL) + if (previous_aqt_sub != NULL) previous_aqt_sub->end = current->start-1; - + previous_aqt_sub = current; #endif @@ -769,7 +769,7 @@ static subtitle *sub_read_line_subrip09(stream_t *st,subtitle *current) { int a1,a2,a3; char * next=NULL; int i,len; - + while (1) { // try to locate next subtitle if (!stream_read_line (st, line, LINE_LEN)) @@ -779,13 +779,13 @@ static subtitle *sub_read_line_subrip09(stream_t *st,subtitle *current) { } current->start = a1*360000+a2*6000+a3*100; - + #ifdef CONFIG_SORTSUB - previous_sub_end = (current->start) ? current->start - 1 : 0; + previous_sub_end = (current->start) ? current->start - 1 : 0; #else - if (previous_subrip09_sub != NULL) + if (previous_subrip09_sub != NULL) previous_subrip09_sub->end = current->start-1; - + previous_subrip09_sub = current; #endif @@ -793,9 +793,9 @@ static subtitle *sub_read_line_subrip09(stream_t *st,subtitle *current) { return NULL; next = line,i=0; - + current->text[0]=""; // just to be sure that string is clear - + while ((next =sub_readtext (next, &(current->text[i])))) { if (current->text[i]==ERR) {return ERR;} i++; @@ -1011,7 +1011,7 @@ static int sub_autodetect (stream_t* st, int *uses_time) { char line[LINE_LEN+1]; int i,j=0; char p; - + while (j < 100) { j++; if (!stream_read_line (st, line, LINE_LEN)) @@ -1089,7 +1089,7 @@ void subcp_open (stream_t *st) } else { cp_tmp = enca_fallback; if (st) - mp_msg(MSGT_SUBREADER,MSGL_WARN,"SUB: enca failed, stream must be seekable.\n"); + mp_msg(MSGT_SUBREADER,MSGL_WARN,"SUB: enca failed, stream must be seekable.\n"); } } #endif @@ -1162,7 +1162,7 @@ static subtitle* sub_fribidi (subtitle *sub, int sub_utf8) if(flip_hebrew) { // Please fix the indentation someday fribidi_set_mirroring(1); fribidi_set_reorder_nsm(0); - + if( sub_utf8 == 0 ) { char_set_num = fribidi_parse_charset (fribidi_charset?fribidi_charset:"ISO8859-8"); }else { @@ -1286,7 +1286,7 @@ const char* guess_buffer_cp(unsigned char* buffer, int buflen, const char *prefe mp_msg(MSGT_SUBREADER, MSGL_V, "%s ", languages[i]); } mp_msg(MSGT_SUBREADER, MSGL_V, "\n"); - + for (i = 0; i < langcnt; i++) { if (strcasecmp(languages[i], preferred_language) != 0) continue; analyser = enca_analyser_alloc(languages[i]); @@ -1297,7 +1297,7 @@ const char* guess_buffer_cp(unsigned char* buffer, int buflen, const char *prefe break; } } - + free(languages); if (!detected_sub_cp) { @@ -1321,7 +1321,7 @@ const char* guess_cp(stream_t *st, const char *preferred_language, const char *f buflen = stream_read(st,buffer, MAX_GUESS_BUFFER_SIZE); detected_sub_cp = guess_buffer_cp(buffer, buflen, preferred_language, fallback); - + free(buffer); stream_reset(st); stream_seek(st,0); @@ -1355,17 +1355,17 @@ sub_data* sub_read_file (char *filename, float fps) { { sub_read_line_mpl2, NULL, "mpl2" } }; struct subreader *srp; - + if(filename==NULL) return NULL; //qnx segfault i = 0; fd=open_stream (filename, NULL, &i); if (!fd) return NULL; - + sub_format=sub_autodetect (fd, &uses_time); mpsub_multiplier = (uses_time ? 100.0 : 1.0); if (sub_format==SUB_INVALID) {mp_msg(MSGT_SUBREADER,MSGL_WARN,"SUB: Could not determine file format\n");return NULL;} srp=sr+sub_format; mp_msg(MSGT_SUBREADER, MSGL_V, "SUB: Detected subtitle file format: %s\n", srp->name); - + stream_reset(fd); stream_seek(fd,0); @@ -1395,13 +1395,13 @@ sub_data* sub_read_file (char *filename, float fps) { #endif return NULL; } - + #ifdef CONFIG_SORTSUB sub = malloc(sizeof(subtitle)); //This is to deal with those formats (AQT & Subrip) which define the end of a subtitle //as the beginning of the following previous_sub_end = 0; -#endif +#endif while(1){ if(sub_num>=n_max){ n_max+=16; @@ -1425,7 +1425,7 @@ sub_data* sub_read_file (char *filename, float fps) { subcp_close(); #endif if ( first ) free(first); - return NULL; + return NULL; } // Apply any post processing that needs recoding first if ((sub!=ERR) && !sub_no_text_pp && srp->post) srp->post(sub); @@ -1471,7 +1471,7 @@ sub_data* sub_read_file (char *filename, float fps) { #endif if(sub==ERR) ++sub_errs; else ++sub_num; // Error vs. Valid } - + free_stream(fd); #ifdef CONFIG_ICONV @@ -1713,7 +1713,7 @@ char * strreplace( char * in,char * what,char * whereof ) { int i; char * tmp; - + if ( ( in == NULL )||( what == NULL )||( whereof == NULL )||( ( tmp=strstr( in,what ) ) == NULL ) ) return NULL; for( i=0;i<strlen( whereof );i++ ) tmp[i]=whereof[i]; if ( strlen( what ) > strlen( whereof ) ) tmp[i]=0; @@ -1744,7 +1744,7 @@ static void strcpy_trim(char *d, char *s) } *d = 0; } - + static void strcpy_strip_ext(char *d, char *s) { char *tmp = strrchr(s,'.'); @@ -1760,7 +1760,7 @@ static void strcpy_strip_ext(char *d, char *s) d++; } } - + static void strcpy_get_ext(char *d, char *s) { char *tmp = strrchr(s,'.'); @@ -1802,14 +1802,14 @@ char** sub_filenames(const char* path, char *fname) { char *f_dir, *f_fname, *f_fname_noext, *f_fname_trim, *tmp, *tmp_sub_id; char *tmp_fname_noext, *tmp_fname_trim, *tmp_fname_ext, *tmpresult; - + int len, pos, found, i, j; char * sub_exts[] = { "utf", "utf8", "utf-8", "sub", "srt", "smi", "rt", "txt", "ssa", "aqt", "jss", "js", "ass", NULL}; subfn *result; char **result2; - + int subcnt; - + FILE *f; DIR *d; @@ -1831,15 +1831,15 @@ char** sub_filenames(const char* path, char *fname) result = malloc(sizeof(subfn)*MAX_SUBTITLE_FILES); memset(result, 0, sizeof(subfn)*MAX_SUBTITLE_FILES); - + subcnt = 0; - + tmp = strrchr(fname,'/'); #if defined(__MINGW32__) || defined(__CYGWIN__) || defined(__OS2__) if(!tmp)tmp = strrchr(fname,'\\'); if(!tmp)tmp = strrchr(fname,':'); #endif - + // extract filename & dirname from fname if (tmp) { strcpy(f_fname, tmp+1); @@ -1850,7 +1850,7 @@ char** sub_filenames(const char* path, char *fname) strcpy(f_fname, fname); strcpy(f_dir, "./"); } - + strcpy_strip_ext(f_fname_noext, f_fname); strcpy_trim(f_fname_trim, f_fname_noext); @@ -1889,7 +1889,7 @@ char** sub_filenames(const char* path, char *fname) break; } } - + // we have a (likely) subtitle file if (found) { int prio = 0; @@ -1900,7 +1900,7 @@ char** sub_filenames(const char* path, char *fname) if (strcmp(tmp_fname_trim, tmpresult) == 0 && sub_match_fuzziness >= 1) { // matches the movie name + lang extension prio = 5; - } + } } if (!prio && strcmp(tmp_fname_trim, f_fname_trim) == 0) { // matches the movie name @@ -1950,11 +1950,11 @@ char** sub_filenames(const char* path, char *fname) } closedir(d); } - + } if (tmp_sub_id) free(tmp_sub_id); - + free(f_dir); free(f_fname); free(f_fname_noext); @@ -1975,7 +1975,7 @@ char** sub_filenames(const char* path, char *fname) result2[i] = result[i].fname; } result2[subcnt] = NULL; - + free(result); return result2; @@ -1998,7 +1998,7 @@ void list_sub_file(sub_data* subd){ mp_msg(MSGT_SUBREADER,MSGL_INFO,"\n"); } - mp_msg(MSGT_SUBREADER,MSGL_INFO,"Subtitle format %s time.\n", + mp_msg(MSGT_SUBREADER,MSGL_INFO,"Subtitle format %s time.\n", subd->sub_uses_time ? "uses":"doesn't use"); mp_msg(MSGT_SUBREADER,MSGL_INFO,"Read %i subtitles, %i errors.\n", subd->sub_num, subd->sub_errs); } @@ -2015,7 +2015,7 @@ void dump_srt(sub_data* subd, float fps){ sub_fps = fps; fd=fopen("dumpsub.srt","w"); if(!fd) - { + { perror("dump_srt: fopen"); return; } @@ -2081,7 +2081,7 @@ void dump_mpsub(sub_data* subd, float fps){ fprintf (fd, "%.0f",a); else fprintf (fd, "%.2f",a); - + if ( (float)((int)b) == b) fprintf (fd, " %.0f\n",b); else @@ -2128,7 +2128,7 @@ void dump_microdvd(sub_data* subd, float fps) { start -= delay; end -= delay; fprintf(fd, "{%d}{%d}", start, end); - for (j = 0; j < subs[i].lines; ++j) + for (j = 0; j < subs[i].lines; ++j) fprintf(fd, "%s%s", j ? "|" : "", subs[i].text[j]); fprintf(fd, "\n"); } @@ -2148,11 +2148,11 @@ void dump_jacosub(sub_data* subd, float fps) { sub_fps = fps; fd=fopen("dumpsub.jss","w"); if(!fd) - { + { perror("dump_jacosub: fopen"); return; } - fprintf(fd, "#TIMERES %d\n", (subd->sub_uses_time) ? 100 : (int)sub_fps); + fprintf(fd, "#TIMERES %d\n", (subd->sub_uses_time) ? 100 : (int)sub_fps); for(i=0; i < subd->sub_num; i++) { onesub=subs+i; //=&subs[i]; @@ -2197,7 +2197,7 @@ void dump_sami(sub_data* subd, float fps) { sub_fps = fps; fd=fopen("dumpsub.smi","w"); if(!fd) - { + { perror("dump_jacosub: fopen"); return; } @@ -2243,9 +2243,9 @@ void dump_sami(sub_data* subd, float fps) { void sub_free( sub_data * subd ) { int i; - + if ( !subd ) return; - + if (subd->subtitles) { for (i=0; i < subd->subtitles->lines; i++) free( subd->subtitles->text[i] ); free( subd->subtitles ); @@ -2306,7 +2306,7 @@ void sub_add_text(subtitle *sub, const char *txt, int len, double endpts) { buf[pos] = 0; sub->lines++; pos = 0; - buf = malloc(MAX_SUBLINE + 1); + buf = malloc(MAX_SUBLINE + 1); sub->text[sub->lines] = buf; sub->endpts[sub->lines] = endpts; } diff --git a/vidix/vidix.h b/vidix/vidix.h index 0a00d89412..0f402a3cb7 100644 --- a/vidix/vidix.h +++ b/vidix/vidix.h @@ -38,7 +38,7 @@ #define PROBE_NORMAL 0 /* normal probing */ #define PROBE_FORCE 1 /* ignore device_id but recognize device if it's known */ - + typedef enum vidix_dev_type { TYPE_OUTPUT = 0x00000000, /* Is a video playback device */ TYPE_CAPTURE = 0x00000001, /* Is a capture device */ @@ -58,7 +58,7 @@ typedef enum vidix_dev_flag { FLAG_SUBPIC = 0x00001000, /* Card supports DVD subpictures */ FLAG_EQUALIZER = 0x00002000, /* Card supports equalizer */ } vidix_dev_flag_t; - + typedef struct vidix_capability_s { char name[64]; /* Driver name */ @@ -563,7 +563,7 @@ packet_queue_ensure(packet_queue_t *queue, unsigned int needed_size) static int packet_queue_grow(packet_queue_t *queue) { - if (packet_queue_ensure(queue, queue->packets_size + 1) < 0) + if (packet_queue_ensure(queue, queue->packets_size + 1) < 0) return -1; packet_construct(queue->packets + queue->packets_size); ++queue->packets_size; @@ -1380,7 +1380,7 @@ vobsub_out_output(void *me, const unsigned char *packet, int len, double pts) last_pts = pts; last_pts_set = 1; - /* Packet start code: Windows' Vobsub needs this */ + /* Packet start code: Windows' Vobsub needs this */ p = buffer; *p++ = 0; /* 0x00 */ *p++ = 0; diff --git a/xvid_vbr.c b/xvid_vbr.c index 10efd6d0df..85735d96aa 100644 --- a/xvid_vbr.c +++ b/xvid_vbr.c @@ -1,7 +1,7 @@ /****************************************************************************** * * XviD VBR Library - * + * * Copyright (C) 2002 Edouard Gomez <ed.gomez@wanadoo.fr> * * The curve treatment algorithm is based on work done by Foxer <email?> and @@ -196,7 +196,7 @@ int vbrSetDefaults(vbr_control_t *state) /* Alt curve */ state->use_alt_curve = 1; - state->alt_curve_type = VBR_ALT_CURVE_LINEAR; + state->alt_curve_type = VBR_ALT_CURVE_LINEAR; state->alt_curve_low_dist = 90; state->alt_curve_high_dist = 500; state->alt_curve_min_rel_qual = 50; @@ -227,7 +227,7 @@ int vbrSetDefaults(vbr_control_t *state) * Function description : * * This function initialiaze the vbr_control_t state passed in parameter. - * + * * The initialization depends on state->mode, there are 4 modes allowed. * Each mode description is done in the README file shipped with the lib. * @@ -386,7 +386,7 @@ int vbrUpdate(vbr_control_t *state, idx--; - state->debug_quant_count[idx]++; + state->debug_quant_count[idx]++; } @@ -508,7 +508,7 @@ static int vbr_init_2pass1(void *sstate) if(state->filename == NULL || state->filename[0] == '\0') return(-1); - /* Initialize safe defaults for 2pass 1 */ + /* Initialize safe defaults for 2pass 1 */ state->pass1_file = NULL; state->nb_frames = 0; state->nb_keyframes = 0; @@ -530,7 +530,7 @@ static int vbr_init_2pass1(void *sstate) fprintf(f, "# frames : \n"); fprintf(f, "# keyframes : \n"); fprintf(f, "#\n# quant | intra | header bytes | total bytes | kblocks |" - " mblocks | ublocks\n\n"); + " mblocks | ublocks\n\n"); /* Save file pointer */ state->pass1_file = f; @@ -561,7 +561,7 @@ static int vbr_update_2pass1(void *sstate, int kblocks, int mblocks, int ublocks) - + { @@ -654,7 +654,7 @@ static int vbr_init_2pass2(void *sstate) if(state->filename == NULL || state->filename[0] == '\0') return(-1); - /* Initialize safe defaults for 2pass 2 */ + /* Initialize safe defaults for 2pass 2 */ state->pass1_file = NULL; state->nb_frames = 0; state->nb_keyframes = 0; @@ -996,7 +996,7 @@ static int vbr_init_2pass2(void *sstate) default: case VBR_ALT_CURVE_LINEAR: total2 += - dbytes * + dbytes * (state->alt_curve_mid_qual - state->alt_curve_qual_dev * (dbytes - state->average_frame) / state->alt_curve_low_diff); break; @@ -1104,7 +1104,7 @@ static int vbr_init_2pass2(void *sstate) } } - + } } @@ -1133,7 +1133,7 @@ static int vbr_init_2pass2(void *sstate) /* Get back to the beginning of frame statistics */ fseek(state->pass1_file, pos_firstframe, SEEK_SET); - /* + /* * Small hack : We have to get next frame stats before the * getintra/quant calls * User clients update the data when they call vbrUpdate @@ -1144,7 +1144,7 @@ static int vbr_init_2pass2(void *sstate) /* Fake vars */ int next_hbytes, next_kblocks, next_mblocks, next_ublocks; - + fscanf(state->pass1_file, "%d %d %d %d %d %d %d\n", &state->pass1_quant, &state->pass1_intra, &next_hbytes, &state->pass1_bytes, &next_kblocks, &next_mblocks, @@ -1492,7 +1492,7 @@ static int vbr_update_2pass2(void *sstate, int kblocks, int mblocks, int ublocks) - + { @@ -1562,7 +1562,7 @@ static int vbr_update_2pass2(void *sstate, /* Ok next frame */ state->cur_frame++; - + return(0); } diff --git a/xvid_vbr.h b/xvid_vbr.h index 8243f88614..01c1cef366 100644 --- a/xvid_vbr.h +++ b/xvid_vbr.h @@ -1,7 +1,7 @@ /****************************************************************************** * * XviD VBR Library - * + * * Copyright (C) 2002 Edouard Gomez <ed.gomez@wanadoo.fr> * * The curve treatment algorithm is based on work done by Foxer <email?> and |