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. + * < |