diff options
57 files changed, 997 insertions, 206 deletions
diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1 index 86a3b4c225..ab946c2fd4 100644 --- a/DOCS/man/en/mplayer.1 +++ b/DOCS/man/en/mplayer.1 @@ -4219,6 +4219,10 @@ Each file takes the frame number padded with leading zeros as name. .IPs z=<0\-9> Specifies the compression level. 0 is no compression, 9 is maximum compression. +.IPs alpha (default: noalpha) +Create PNG files with an alpha channel. +Note that MPlayer in general does not support alpha, so this will only +be useful in some rare cases. .RE .PD 1 . diff --git a/DOCS/man/fr/mplayer.1 b/DOCS/man/fr/mplayer.1 index 93494f6cbe..21e3624540 100644 --- a/DOCS/man/fr/mplayer.1 +++ b/DOCS/man/fr/mplayer.1 @@ -1,4 +1,4 @@ -.\" synced with r28096 +.\" synced with r28126 .\" Encoding: iso-8859-1 .\" MPlayer (C) 2000-2008 MPlayer Team .\" The English man page was/is done by Gabucino, Diego Biurrun, Jonas Jermann @@ -4459,6 +4459,10 @@ Ne gre que les formats RGB et BGR 24 bits/pixel. .IPs z=<0\-9> Dfinit le taux de compression. 0 quivaut pas de compression et 9 la compression maximale. +.IPs alpha (par dfaut\ : noalpha) +Cre un fichier PNG avec un canal alpha. +Notez que MPlayer ne gre en gnral pas les canaux alpha, donc cette +option sera probablement rarement utile. .RE .PD 1 . diff --git a/DOCS/xml/en/install.xml b/DOCS/xml/en/install.xml index 25440e429c..fae3bd8618 100644 --- a/DOCS/xml/en/install.xml +++ b/DOCS/xml/en/install.xml @@ -442,7 +442,7 @@ FAAD2 binaries are not available from audiocoding.com, but you can (apt-)get Debian packages from <ulink url="http://www.debian-multimedia.org/">Christian Marillat</ulink>, Mandrake/Mandriva RPMs from the <ulink url="http://plf.zarb.org">P.L.F</ulink> -and Fedora RPMs from <ulink url="http://rpm.livna.org/">Livna</ulink>. +and Fedora/CentOS/RHEL RPMs from <ulink url="http://rpmfusion.org/">RPMFusion</ulink>. </para> <para> If you choose to build from source, you do not need all of FAAD2 to decode diff --git a/DOCS/xml/en/ports.xml b/DOCS/xml/en/ports.xml index b752941c1e..29ed6bd422 100644 --- a/DOCS/xml/en/ports.xml +++ b/DOCS/xml/en/ports.xml @@ -61,8 +61,8 @@ our binary codec packages for a while, you can (apt-)get them from <para> Dominik Mierzejewski maintains the official RPM packages of -<application>MPlayer</application> for Fedora Core. They are available -from <ulink url="http://rpm.livna.org/">Livna repository</ulink>. +<application>MPlayer</application> for Fedora and CentOS/RHEL. They are available +from <ulink url="http://rpmfusion.org/">RPMFusion repository</ulink>. </para> <para> @@ -3642,7 +3642,7 @@ EOF _vomodules="quartz $_vomodules" _def_quicktime='#define CONFIG_QUICKTIME 1' else - _quartz=yes + _quartz=no _def_quartz='#undef CONFIG_QUARTZ' _novomodules="quartz $_novomodules" _def_quicktime='#undef CONFIG_QUICKTIME' @@ -5486,7 +5486,7 @@ fi echocheck "VCD support" -if linux || freebsd || netbsd || dragonfly || bsdos || darwin || sunos || mingw32; then +if linux || freebsd || netbsd || openbsd || dragonfly || bsdos || darwin || sunos || mingw32; then _inputmodules="vcd $_inputmodules" _def_vcd='#define CONFIG_VCD 1' _vcd="yes" @@ -6077,15 +6077,25 @@ int main(void) { return 0; } EOF - for _ld_theora in "`$_pkg_config --silence-errors --libs --cflags theora`" "-ltheora -logg"; do - cc_check $_ld_theora && _ld_extra="$_ld_extra $_ld_theora" \ - && _theora=yes && break - done + _ld_theora=$($_pkg_config --silence-errors --libs theora) + _inc_theora=$($_pkg_config --silence-errors --cflags theora) + cc_check $_inc_theora $_ld_theora && _ld_extra="$_ld_extra $_ld_theora" && + _inc_extra="$_inc_extra $_inc_theora" && _theora=yes + if test _theora = no; then + _ld_theora="-ltheora -logg" + cc_check $_ld_theora && _ld_extra="$_ld_extra $_ld_theora" && _theora=yes + fi if test "$_theora" = no && test "$_tremor_internal" = yes; then - for _ld_theora in "`$_pkg_config --silence-errors --libs --cflags theora`" "-ltheora -logg"; do - cc_check tremor/bitwise.c $_ld_theora \ - && _ld_extra="$_ld_extra $_ld_theora" && theora=yes && break - done + _ld_theora=$($_pkg_config --silence-errors --libs theora) + _inc_theora=$($_pkg_config --silence-errors --cflags theora) + cc_check tremor/bitwise.c $_inc_theora $_ld_theora && + _ld_extra="$_ld_extra $_ld_theora" && + _inc_extra="$_inc_extra $_inc_theora" && _theora=yes + if test _theora = no; then + _ld_theora="-ltheora -logg" + cc_check tremor/bitwise.c $_ld_theora && + _ld_extra="$_ld_extra $_ld_theora" && _theora=yes + fi fi fi if test "$_theora" = yes ; then @@ -6388,7 +6398,7 @@ if test "$_real" = auto ; then _real=no _res_comment="dynamic loader support needed" if test "$_dl" = yes || test "$_win32dll" = yes && - (linux || freebsd || netbsd || dragonfly || darwin || win32) ; then + (linux || freebsd || netbsd || openbsd || dragonfly || darwin || win32) ; then _real=yes fi fi @@ -6455,7 +6465,7 @@ int main(void) { return 0; } EOF _live=no - for I in $_inc_extra "-I$_libdir/live" "-I/usr/lib/live" "-I/usr/local/live" "-I/usr/local/lib/live" ; do + for I in $_inc_extra "-I$_libdir/live" "-I/usr/lib/live" "-I/usr/lib64/live" "-I/usr/local/live" "-I/usr/local/lib/live" ; do cxx_check $I/liveMedia/include $I/UsageEnvironment/include \ $I/groupsock/include && _livelibdir=`echo $I| sed s/-I//` && \ _ld_extra="$_livelibdir/liveMedia/libliveMedia.a \ @@ -7672,8 +7682,7 @@ fi _ld_extra="$_ld_extra $_ld_pthread $_ld_dl $_ld_dl_dynamic" bsdos && _ld_extra="$_ld_extra -ldvd" -netbsd && x86_32 && _ld_extra="$_ld_extra -li386" -openbsd && x86_32 && _ld_extra="$_ld_extra -li386" +(netbsd || openbsd) && x86_32 && _ld_extra="$_ld_extra -li386" _def_debug='#undef MP_DEBUG' test "$_debug" != "" && _def_debug='#define MP_DEBUG 1' diff --git a/cputable.h b/cputable.h index ef3496e1fb..2f5ce20182 100644 --- a/cputable.h +++ b/cputable.h @@ -1,7 +1,24 @@ -/* cputable.h - Maps CPUID to real CPU name. - * Copyleft 2001 by Felix Buenemann <atmosfear at users dot sourceforge dot net> - * This file comes under the GNU GPL, see www.fsf.org for more info! +/* + * Map CPUID to real CPU name. * Family F codenames owe much thanks to Neil Phillips, author of x86test. + * + * Copyright (C) 2001 Felix Buenemann <atmosfear at users.sourceforge.net> + * + * 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_CPUTABLE_H diff --git a/etc/codecs.conf b/etc/codecs.conf index 5322147928..bb9a7a2329 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -145,6 +145,7 @@ videocodec ffmpeg2 fourcc VCR2 fourcc mp2v,mpgv fourcc PIM2 + fourcc LMP2 ; Lead mpeg2 in avi driver ffmpeg dll "mpeg2video" out YV12,I420,IYUV @@ -181,6 +182,7 @@ videocodec ffmpeg12 fourcc mx3n,mx3p fourcc AVmp fourcc mp2v,mpgv + fourcc LMP2 ; Lead mpeg2 in avi driver ffmpeg dll "mpegvideo" out YV12,I420,IYUV @@ -218,6 +220,7 @@ videocodec mpeg12 fourcc mx3n,mx3p fourcc AVmp fourcc mp2v,mpgv + fourcc LMP2 ; Lead mpeg2 in avi driver libmpeg2 ; dll "libmpeg2" out YV12,I420,IYUV @@ -253,6 +256,7 @@ videocodec ffmpeg12mc fourcc mx3n,mx3p fourcc AVmp fourcc mp2v,mpgv + fourcc LMP2 ; Lead mpeg2 in avi driver ffmpeg dll "mpegvideo_xvmc" out IDCT_MPEG2 @@ -800,7 +804,7 @@ videocodec ffodivx fourcc FVFW,fvfw fourcc FFDS fourcc DCOD,MVXM,EM4A,PM4V - fourcc M4T3,DMK2 + fourcc M4T3,DMK2,DIGI driver ffmpeg dll mpeg4 ;opendivx out YV12,I420,IYUV @@ -850,7 +854,7 @@ videocodec xvid fourcc VIDM ; vidm 4.01 codec fourcc FFDS fourcc DCOD,MVXM,EM4A,PM4V - fourcc M4T3,DMK2 + fourcc M4T3,DMK2,DIGI format 0x10000004 ; mpeg 4 es driver xvid out YV12 @@ -1063,6 +1067,7 @@ videocodec ffmjpeg fourcc dmb1 ; MJPEG by Matrox Rainbow Runner fourcc MJLS ; JPEG-LS custom FOURCC for avi - encoder fourcc MMJP + fourcc ACDV ; ACDSee jpeg driver ffmpeg dll mjpeg out 444P @@ -2032,6 +2037,15 @@ videocodec vdom dll "vdowave.drv" ; Need also VDODEC32.dll and DECVW_32.DLL out BGR24 flip +videocodec vdowave3 + info "VDOWave 3 advanced codec" + status working + fourcc VDO3 + fourcc VDOM,VDOW + driver vfw + dll "vdo32_30.drv" ; Need also decvdo.dll + out BGR24 flip + videocodec lsv info "Vianet Lsvx Video Decoder" status working @@ -3183,6 +3197,7 @@ audiocodec faad fourcc "AACP" ; Used in NSV for AACPlus format 0xff format 0x706D + format 0x4143 ; aac in asf driver faad dll libfaad2 @@ -3196,6 +3211,7 @@ audiocodec ffaac fourcc raac,racp format 0xff format 0x706D + format 0x4143 ; aac in asf driver ffmpeg dll aac @@ -3466,6 +3482,7 @@ audiocodec a52 info "AC3-liba52" status working format 0x2000 + ; format 0x332D6361 ; ac-3 in mp4 -- not working fourcc dnet driver liba52 dll "liba52" @@ -3474,6 +3491,7 @@ audiocodec ffac3 info "FFmpeg AC-3" status working format 0x2000 + format 0x332D6361 ; ac-3 in mp4 fourcc dnet driver ffmpeg dll ac3 @@ -3543,6 +3561,15 @@ audiocodec ffadcpmswf driver ffmpeg dll "adpcm_swf" +audiocodec voxvoice + info "VoxWare MetaVoice" + status working + comment "windows users need msms001.vwp and mvoice.vwp in windows\\system32 folder" + format 0x74 + driver dshow + dll "voxmvdec.ax" ; need also msms001.vwp and mvoice.vwp + guid 0x46e32b01, 0xa465, 0x11d1, 0xb5, 0x50, 0x00, 0x60, 0x97, 0x24, 0x2d, 0x8d + audiocodec voxware info "VoxWare" status working @@ -3607,6 +3634,7 @@ audiocodec hwac3 info "AC3 through S/PDIF" status working format 0x2000 + format 0x332D6361 ; ac-3 in mp4 fourcc dnet driver hwac3 @@ -3768,3 +3796,11 @@ audiocodec msnsiren format 0x28E driver acm dll "sirenacm.dll" + +audiocodec uleaddva + info "Ulead DV ACM" + status working + format 0x215 + format 0x216 + driver acm + dll "dvacm.acm"
\ No newline at end of file diff --git a/help/help_mp-cs.h b/help/help_mp-cs.h index dc1c4e7f26..1e168dd417 100644 --- a/help/help_mp-cs.h +++ b/help/help_mp-cs.h @@ -1688,7 +1688,7 @@ static char help_text[]= #define MSGTR_LIBVO_MGA_InvalidOutputFormat "[MGA] Neplatný formát výstupu %0X\n" #define MSGTR_LIBVO_MGA_IncompatibleDriverVersion "[MGA] Verze vašeho mga_vid ovladače není kompatibilní s touto verzí MPlayeru!\n" #define MSGTR_LIBVO_MGA_CouldntOpen "[MGA] Nemohu otevřít: %s\n" -#define MGSTR_LIBVO_MGA_ResolutionTooHigh "[MGA] Vstupní rozlišení minimálně v jednom rozměru větší než 1023x1023. Přeškálujte prosím softwarově, nebo použijte -lavdopts lowres=1\n" +#define MSGTR_LIBVO_MGA_ResolutionTooHigh "[MGA] Vstupní rozlišení minimálně v jednom rozměru větší než 1023x1023. Přeškálujte prosím softwarově, nebo použijte -lavdopts lowres=1\n" // libvo/vesa_lvo.c diff --git a/help/help_mp-de.h b/help/help_mp-de.h index 5d37b13415..8cb6ac4805 100644 --- a/help/help_mp-de.h +++ b/help/help_mp-de.h @@ -1724,8 +1724,8 @@ static char help_text[]= #define MSGTR_LIBVO_MGA_InvalidOutputFormat "[MGA] ungültiges Ausgabeformat %0X\n" #define MSGTR_LIBVO_MGA_IncompatibleDriverVersion "[MGA] Die Treiberversion von mga_vid ist mit dieser MPlayer-Version nicht kompatibel!\n" #define MSGTR_LIBVO_MGA_CouldntOpen "[MGA] Konnte %s nicht öffnen\n" -#define MGSTR_LIBVO_MGA_ResolutionTooHigh "[MGA] Auflösung der Quelle ist in mindestens einer Dimension größer als 1023x1023.\n[MGA] Bitte skaliere in Software oder verwende -lavdopts lowres=1.\n" -#define MGSTR_LIBVO_MGA_mgavidVersionMismatch "[MGA] Unterschiedliche Versionen des mga_vid-Treibers des Kernels (%u) und MPlayer (%u).\n" +#define MSGTR_LIBVO_MGA_ResolutionTooHigh "[MGA] Auflösung der Quelle ist in mindestens einer Dimension größer als 1023x1023.\n[MGA] Bitte skaliere in Software oder verwende -lavdopts lowres=1.\n" +#define MSGTR_LIBVO_MGA_mgavidVersionMismatch "[MGA] Unterschiedliche Versionen des mga_vid-Treibers des Kernels (%u) und MPlayer (%u).\n" // libvo/vesa_lvo.c diff --git a/help/help_mp-en.h b/help/help_mp-en.h index f291818920..246731ad2c 100644 --- a/help/help_mp-en.h +++ b/help/help_mp-en.h @@ -955,8 +955,8 @@ static char help_text[]= #define MSGTR_LIBVO_MGA_InvalidOutputFormat "[MGA] invalid output format %0X\n" #define MSGTR_LIBVO_MGA_IncompatibleDriverVersion "[MGA] Your mga_vid driver version is incompatible with this MPlayer version!\n" #define MSGTR_LIBVO_MGA_CouldntOpen "[MGA] Couldn't open: %s\n" -#define MGSTR_LIBVO_MGA_ResolutionTooHigh "[MGA] Source resolution exceeds 1023x1023 in at least one dimension.\n[MGA] Rescale in software or use -lavdopts lowres=1.\n" -#define MGSTR_LIBVO_MGA_mgavidVersionMismatch "[MGA] mismatch between kernel (%u) and MPlayer (%u) mga_vid driver versions\n" +#define MSGTR_LIBVO_MGA_ResolutionTooHigh "[MGA] Source resolution exceeds 1023x1023 in at least one dimension.\n[MGA] Rescale in software or use -lavdopts lowres=1.\n" +#define MSGTR_LIBVO_MGA_mgavidVersionMismatch "[MGA] mismatch between kernel (%u) and MPlayer (%u) mga_vid driver versions\n" // vo_null.c #define MSGTR_LIBVO_NULL_UnknownSubdevice "[VO_NULL] Unknown subdevice: %s.\n" diff --git a/help/help_mp-es.h b/help/help_mp-es.h index 076c17f5c3..76a5321a69 100644 --- a/help/help_mp-es.h +++ b/help/help_mp-es.h @@ -961,8 +961,8 @@ static char help_text[]= #define MSGTR_LIBVO_MGA_InvalidOutputFormat "[MGA] Formáto de salida inválido %0X\n" #define MSGTR_LIBVO_MGA_IncompatibleDriverVersion "[MGA] La versión de tu driver mga_vid no es compatible con esta versión de MPlayer!\n" #define MSGTR_LIBVO_MGA_CouldntOpen "[MGA] No pude abrir: %s\n" -#define MGSTR_LIBVO_MGA_ResolutionTooHigh "[MGA] La resolución de la fuente es en por lo menos una dimensión mas grande que 1023x1023. Por favor escale en software o use -lavdopts lowres=1\n" -#define MGSTR_LIBVO_MGA_mgavidVersionMismatch "[MGA] Las versiones del controlador mga_vid del kernel (%u) y MPlayer (%u) no coinciden\n" +#define MSGTR_LIBVO_MGA_ResolutionTooHigh "[MGA] La resolución de la fuente es en por lo menos una dimensión mas grande que 1023x1023. Por favor escale en software o use -lavdopts lowres=1\n" +#define MSGTR_LIBVO_MGA_mgavidVersionMismatch "[MGA] Las versiones del controlador mga_vid del kernel (%u) y MPlayer (%u) no coinciden\n" // vo_null.c #define MSGTR_LIBVO_NULL_UnknownSubdevice "[VO_NULL] Sub-dispositivo desconocido: %s.\n" diff --git a/help/help_mp-fr.h b/help/help_mp-fr.h index a83950b8ca..339674d352 100644 --- a/help/help_mp-fr.h +++ b/help/help_mp-fr.h @@ -1695,8 +1695,8 @@ static char help_text[]= #define MSGTR_LIBVO_MGA_InvalidOutputFormat "[MGA] Format de sortie invalide %0X\n" #define MSGTR_LIBVO_MGA_IncompatibleDriverVersion "[MGA] La version de votre pilote mga_vid est incompatible avec cette version de MPlayer !\n" #define MSGTR_LIBVO_MGA_CouldntOpen "[MGA] Impossible d'ouvrir : %s\n" -#define MGSTR_LIBVO_MGA_ResolutionTooHigh "[MGA] La resolution à sa source est au moins dans une dimension plus large que 1023x1023. Veuillez remettre à l'échelle dans le logiciel ou utiliser -lavdopts lowres=1\n" -#define MGSTR_LIBVO_MGA_mgavidVersionMismatch "[MGA] La version du driver mga_vid (%u) ne correspond pas à celle utilisée lors de la compilation de MPlayer (%u)\n" +#define MSGTR_LIBVO_MGA_ResolutionTooHigh "[MGA] La resolution à sa source est au moins dans une dimension plus large que 1023x1023. Veuillez remettre à l'échelle dans le logiciel ou utiliser -lavdopts lowres=1\n" +#define MSGTR_LIBVO_MGA_mgavidVersionMismatch "[MGA] La version du driver mga_vid (%u) ne correspond pas à celle utilisée lors de la compilation de MPlayer (%u)\n" // libvo/vesa_lvo.c diff --git a/help/help_mp-hu.h b/help/help_mp-hu.h index 5fb458e785..6b33d9e93c 100644 --- a/help/help_mp-hu.h +++ b/help/help_mp-hu.h @@ -954,8 +954,8 @@ static char help_text[]= #define MSGTR_LIBVO_MGA_InvalidOutputFormat "[MGA] Hibás kimeneti formátum %0X\n" #define MSGTR_LIBVO_MGA_IncompatibleDriverVersion "[MGA] Az mga_vid vezérlőd verziója nem kompatibilis ezzel az MPlayer verzióval!\n" #define MSGTR_LIBVO_MGA_CouldntOpen "[MGA] Nem nyitható meg: %s\n" -#define MGSTR_LIBVO_MGA_ResolutionTooHigh "[MGA] A forrás felbontása legalább egy dimenzióban nagyobb, mint 1023x1023. Méretezd át szoftveresen vagy használd a -lavdopts lowres=1-t\n" -#define MGSTR_LIBVO_MGA_mgavidVersionMismatch "[MGA] különbség a kernel (%u) és az MPlayer (%u) mga_vid verziói között\n" +#define MSGTR_LIBVO_MGA_ResolutionTooHigh "[MGA] A forrás felbontása legalább egy dimenzióban nagyobb, mint 1023x1023. Méretezd át szoftveresen vagy használd a -lavdopts lowres=1-t\n" +#define MSGTR_LIBVO_MGA_mgavidVersionMismatch "[MGA] különbség a kernel (%u) és az MPlayer (%u) mga_vid verziói között\n" // vo_null.c #define MSGTR_LIBVO_NULL_UnknownSubdevice "[VO_NULL] Ismeretlen aleszköz: %s.\n" diff --git a/help/help_mp-it.h b/help/help_mp-it.h index 55bf3c071f..5e7459d2bf 100644 --- a/help/help_mp-it.h +++ b/help/help_mp-it.h @@ -1676,8 +1676,8 @@ static char help_text[]= #define MSGTR_LIBVO_MGA_InvalidOutputFormat "[MGA] formato di uscita %0X invalido\n" #define MSGTR_LIBVO_MGA_IncompatibleDriverVersion "[MGA] La versione del tuo driver mga_vid è incompatibile con questo MPlayer!\n" #define MSGTR_LIBVO_MGA_CouldntOpen "[MGA] Impossibile aprire: %s\n" -#define MGSTR_LIBVO_MGA_ResolutionTooHigh "[MGA] La risoluzione del sorgente ha almeno una delle due dimensioni maggiore di 1023x1023. Per favore ridimensiona via software o usa -lavdopts lowres=1\n" -#define MGSTR_LIBVO_MGA_mgavidVersionMismatch "[MGA] incongruenza tra le versioni del driver mga_vid del kernel (%u) e di MPlayer (%u)\n" +#define MSGTR_LIBVO_MGA_ResolutionTooHigh "[MGA] La risoluzione del sorgente ha almeno una delle due dimensioni maggiore di 1023x1023. Per favore ridimensiona via software o usa -lavdopts lowres=1\n" +#define MSGTR_LIBVO_MGA_mgavidVersionMismatch "[MGA] incongruenza tra le versioni del driver mga_vid del kernel (%u) e di MPlayer (%u)\n" // libvo/vesa_lvo.c #define MSGTR_LIBVO_VESA_ThisBranchIsNoLongerSupported "[VESA_LVO] Questo branch non è più supportato.\n[VESA_LVO] Per favore usa al suo posto -vo vesa:vidix.\n" diff --git a/help/help_mp-pl.h b/help/help_mp-pl.h index 7bd652881e..7d09950edb 100644 --- a/help/help_mp-pl.h +++ b/help/help_mp-pl.h @@ -1575,7 +1575,7 @@ static char help_text[]= #define MSGTR_LIBVO_MGA_InvalidOutputFormat "[MGA] niepoprawny format wyjściowy %0X\n" #define MSGTR_LIBVO_MGA_IncompatibleDriverVersion "[MGA] Wersja Twojego sterownika mga_vid jest niekompatybilna z tą wersją MPlayera!\n" #define MSGTR_LIBVO_MGA_CouldntOpen "[MGA] Nie mogłem otworzyć: %s\n" -#define MGSTR_LIBVO_MGA_ResolutionTooHigh "[MGA] Żródłowa rozdzielczość jest co najmniej o wymiar większa niż 1023x1023. Proszę przeskaluj programowo lub użyj -lavdopts lowres=1\n" +#define MSGTR_LIBVO_MGA_ResolutionTooHigh "[MGA] Żródłowa rozdzielczość jest co najmniej o wymiar większa niż 1023x1023. Proszę przeskaluj programowo lub użyj -lavdopts lowres=1\n" // libvo/vesa_lvo.c diff --git a/help/help_mp-ru.h b/help/help_mp-ru.h index 7297944824..268f53f3eb 100644 --- a/help/help_mp-ru.h +++ b/help/help_mp-ru.h @@ -950,8 +950,8 @@ static char help_text[]= #define MSGTR_LIBVO_MGA_InvalidOutputFormat "[MGA] неверный выходной формат %0X\n" #define MSGTR_LIBVO_MGA_IncompatibleDriverVersion "[MGA] Версия вашего драйвера mga_vid несовместима с этой версией MPlayer!\n" #define MSGTR_LIBVO_MGA_CouldntOpen "[MGA] Не могу открыть: %s\n" -#define MGSTR_LIBVO_MGA_ResolutionTooHigh "[MGA] Разрешение источника, по крайней мере в одном измерении, больше чем\n1023x1023. Перемасштабируйте программно или используйте -lavdopts lowres=1\n" -#define MGSTR_LIBVO_MGA_mgavidVersionMismatch "[MGA] несоответствие версий драйвера mga_vid ядра (%u) и MPlayer (%u)\n" +#define MSGTR_LIBVO_MGA_ResolutionTooHigh "[MGA] Разрешение источника, по крайней мере в одном измерении, больше чем\n1023x1023. Перемасштабируйте программно или используйте -lavdopts lowres=1\n" +#define MSGTR_LIBVO_MGA_mgavidVersionMismatch "[MGA] несоответствие версий драйвера mga_vid ядра (%u) и MPlayer (%u)\n" // libvo/vo_null.c #define MSGTR_LIBVO_NULL_UnknownSubdevice "[VO_NULL] Неизвестное подустройство: %s.\n" diff --git a/help/help_mp-tr.h b/help/help_mp-tr.h index 22488319fd..8e8d105a87 100644 --- a/help/help_mp-tr.h +++ b/help/help_mp-tr.h @@ -1703,7 +1703,7 @@ static char help_text[]= #define MSGTR_LIBVO_MGA_InvalidOutputFormat "[MGA] Geçersiz çıkış biçimi %0X\n" #define MSGTR_LIBVO_MGA_IncompatibleDriverVersion "[MGA] mga_video sürücünüzün sürümü bu MPlayer sürümüyle bağdaşmıyor!\n" #define MSGTR_LIBVO_MGA_CouldntOpen "[MGA] Açılamadı: %s\n" -#define MGSTR_LIBVO_MGA_ResolutionTooHigh "[MGA] kaynak çözünürlüğün en azιndan bir boyutu 1023x1023'ten daha büyükütür. Yazılımla düzteliniz ya da -lavdopts lowres=1 kulanınız\n" +#define MSGTR_LIBVO_MGA_ResolutionTooHigh "[MGA] kaynak çözünürlüğün en azιndan bir boyutu 1023x1023'ten daha büyükütür. Yazılımla düzteliniz ya da -lavdopts lowres=1 kulanınız\n" // libvo/vesa_lvo.c diff --git a/help/help_mp-zh_CN.h b/help/help_mp-zh_CN.h index f7305fef7a..9bca228cb0 100644 --- a/help/help_mp-zh_CN.h +++ b/help/help_mp-zh_CN.h @@ -948,8 +948,8 @@ static char help_text[]= #define MSGTR_LIBVO_MGA_InvalidOutputFormat "[MGA] 无效的输出格式 %0X\n" #define MSGTR_LIBVO_MGA_IncompatibleDriverVersion "[MGA] 你的 mga_vid 驱动版本与 MPlayer 的版本不兼容!\n" #define MSGTR_LIBVO_MGA_CouldntOpen "[MGA] 打不开: %s\n" -#define MGSTR_LIBVO_MGA_ResolutionTooHigh "[MGA] 原分辨率至少有一维超过了 1023x1023。用软件或用 -lavdopts lowres=1 重新缩放\n" -#define MGSTR_LIBVO_MGA_mgavidVersionMismatch "[MGA] 内核（%u）与 MPlayer（%u）mga_vid 驱动版本号不符。\n" +#define MSGTR_LIBVO_MGA_ResolutionTooHigh "[MGA] 原分辨率至少有一维超过了 1023x1023。用软件或用 -lavdopts lowres=1 重新缩放\n" +#define MSGTR_LIBVO_MGA_mgavidVersionMismatch "[MGA] 内核（%u）与 MPlayer（%u）mga_vid 驱动版本号不符。\n" // vo_null.c #define MSGTR_LIBVO_NULL_UnknownSubdevice "[VO_NULL] 未知子设备: %s。\n" diff --git a/help/help_mp-zh_TW.h b/help/help_mp-zh_TW.h index d89c1701b9..0d8770eaac 100644 --- a/help/help_mp-zh_TW.h +++ b/help/help_mp-zh_TW.h @@ -1669,7 +1669,7 @@ static ch |