From 249149095e212c9806e1bf91ce810f8fb41a8f7a Mon Sep 17 00:00:00 2001 From: michael Date: Wed, 4 Jun 2008 03:35:41 +0000 Subject: Remove due to objections by ivan. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26980 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/tech/svn-howto.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/DOCS/tech/svn-howto.txt b/DOCS/tech/svn-howto.txt index 9fdaa7853f..79bfa82057 100644 --- a/DOCS/tech/svn-howto.txt +++ b/DOCS/tech/svn-howto.txt @@ -306,7 +306,6 @@ II. POLICY / RULES: - changes to "historical" parts of docs and web pages - use of internal or external libraries - reverting commits from other developers - - mixing functional and cosmetic changes - making the spelling of words consistent without actually correcting any spelling errors. -- cgit v1.2.3 From eabc14bd7a55deb707534bcac0039fe3afbc1494 Mon Sep 17 00:00:00 2001 From: gpoirier Date: Wed, 4 Jun 2008 09:28:42 +0000 Subject: sync w/r26909, patch by JRaSH %jrash06 A 163 P com% git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26981 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/man/zh/mplayer.1 | 103 ++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 78 insertions(+), 25 deletions(-) diff --git a/DOCS/man/zh/mplayer.1 b/DOCS/man/zh/mplayer.1 index 52babea3db..c536e44e8e 100644 --- a/DOCS/man/zh/mplayer.1 +++ b/DOCS/man/zh/mplayer.1 @@ -1,4 +1,4 @@ -.\" sync with en/mplayer.1 r26460 +.\" sync with en/mplayer.1 r26909 .\" Encoding: UTF-8 .\" Reminder of hard terms which need better/final solution later: .\" /capture; playtree in parent list; colorkey; retrace; desync; downmix; @@ -162,7 +162,7 @@ tivo://主机/[list|llist|fsid] 通过许多原生的和可执行的编解码器的支持, 它能播放绝大部分的 MPEG/\:VOB, AVI, ASF/\:WMA/\:WMV, RM, QT/\:MOV/\:MP4, Ogg/\:OGM, MKV, VIVO, FLI, NuppelVideo, yuv4mpeg, FILM 和 RoQ 文件。 -你还能观看 VCD, SVCD, DVD, 3ivx, DivX 3/4/5, 甚至 WMV 电影。 +你还能观看 VCD、SVCD、DVD、3ivx、DivX 3/4/5、WMV 甚至 H.264 格式的电影。 .PP MPlayer 广泛地支持音视频输出驱动。 它不仅可以使用 X11, Xv, DGA, OpenGL, SVGAlib, fbdev, AAlib, libcaca, @@ -235,6 +235,8 @@ MPlayer 有个完全可配置的, 命令驱动的控制层, 按一下暂停回放, 每按一下就播放一帧(直到按其它键取消步进)。 .IPs "q / ESC" 停止播放和退出。 +.IPs "U\ \ \ \ " +暂停播放（并且当未使用 \-idle 时退出）。 .IPs "+ 和 \-" 调整音频延迟增加/减少 0.1 秒。 .IPs "/ 和 *" @@ -900,6 +902,8 @@ mplayer \-heartbeat\-cmd "gnome\-screensaver\-command \-p" file .IPs conf=<文件名> 指定输入配置文件而不是默认的 ~/\:.mplayer/\:input.conf。 如果没有给出完全路径名, 将假设是 ~/\:.mplayer/\:<文件名>。 +.IPs ar-dev=<设备> +用作为苹果 IR 遥控器的设置（默认值是自动侦测，仅用于 Linux）。 .IPs ar-delay 在开始自动重复一个键之前等待多少毫秒 (0 代表停用)。 .IPs ar-rate @@ -998,6 +1002,10 @@ n 大小的 FIFO 能容纳 (n\-1) 缓冲事件。 关闭支持 LIRC。 . .TP +.B \-noar +关闭对于苹果 IR 遥控器的支持。 +. +.TP .B \-nomouseinput 停用鼠标键 按/\:放 输入 (mozplayerxp 的上下文菜单依赖此选项)。 . @@ -1463,9 +1471,9 @@ IPv4 自动地作为备用。 . .TP .B \-psprobe <字节所在位置> -当播放MPEG-PS流时，此选项让你设定你希望MPlayer查看多少字节以确认所要 -使用的视频编/解码器。 -在播放含有H.264流的EVO文件时需要此选项。 +当播放 MPEG-PS 或 MPEG-PES 流时，此选项让你设定你希望 MPlayer 查看多少字节以确认 +所要使用的视频编/解码器。 +在播放含有 H.264 流的 EVO 或 VDR 文件时需要此选项。 . .TP .B \-pvr <选项1:选项2:...> (仅适用于 PVR) @@ -3125,6 +3133,8 @@ ggi 和 gl2 的都支持此功能。 的 \-v 选项并注意开头有标签 [xv common] 的行。 .PD 0 .RSs +.IPs adaptor=<数值> +选择一个特定的 XVideo 适配器（请检查 xvinfo 的结果）。 .IPs port=<数值> 选择指定的 XVideo 端口。 .IPs ck= @@ -3358,14 +3368,23 @@ OpenGL 视频输出驱动, 简版。 视频尺寸一定小于 OpenGL 实现的最大纹理尺寸。 瞄准能与甚至最基本的 OpenGL 实现一起工作, 但也利用较新的扩展, 允许支持更多的色彩空间和直接渲染。 -既然能对高清晰度提供 -.B 大 -的提速, 请使用 \-dr 如果你的 OpenGL 实现能一同工作。 +要获取最佳的速度，请尝试类似于 +.br +\-vo gl:yuv=2:force\-pbo:ati\-hack \-dr \-noslices +.br +的选项。 此代码执行极少的检测, 所以如果某个特性不工作, 可能是因为你的卡或 OpenGL 实现不支持, 尽管连任何错误消息都没给你。 使用 glxinfo 或类似的工具以显示支持的 OpenGL 扩展。 .PD 0 .RSs +.IPs (no)ati\-hack +当使用了 PBO 时（当使用了 \-dr 或强制使用 \-pbo 时），AIT 驱动可能输出损坏的图像。 +该选项修正这一问题，代价是多使用了一点内存。 +.IPs (no)force\-pbo +总是使用 PBO 传输纹理，即使这需要额外的复制操作。 +当前该选项对于 NVidia 驱动能提升一点速度，而对于 ATI 驱动则是大大提升。 +可能需要 \-noslices 和 ati\-hack 子选项以使其正常工作。 .IPs (no)scaled-osd 当窗口大小改变时, 改变 OSD 的行为方式 (默认是: 停用)。 启用时, 行为就像其他的视频输出驱动, 对固定大小的字体更好。 @@ -3499,8 +3518,9 @@ GL_ARB_fragment_shader！）。至少需要三个纹理单位。提供饱和度 . .TP .B "gl2\ \ \ \ " -OpenGL 视频输出驱动, 第二代。 -支持 OSD 和大于最大纹理尺寸的视频。 +OpenGL 视频输出驱动的修改版。 +支持大于最大纹理尺寸的视频，但是缺少许多 GL 驱动的高级功能和优化选项，并且以后也 +不大可能扩展功能。 .PD 0 .RSs .IPs (no)glfinish @@ -4164,6 +4184,8 @@ mplayer video.nut \-vf format=bgr15 \-vo tga 如果 <宽度> 指定了, 就使用了低分辨率解码, 只要视频的宽度宽过(is major than)或等于 <宽度>。 .RE +.IPs "o\ \ \ \ " +FIXME：没有说明文档 .IPs "sb=<数值> (仅用于 MPEG-2)" 跳过宏块底部的制定行数。 .IPs "st=<数值> (仅用于 MPEG-2)" @@ -7236,7 +7258,7 @@ Windows Media Video, version 2（也就是WMV8） . .TP .B vqmin=<1\-31> -最低量化参数（第1/2阶段编码） +最低量化参数 .RSs .IPs 1 不推荐（文件大很多，质量差别不大，而且有奇怪的副作用：msmpeg4、h263的质量会很差， @@ -7286,7 +7308,7 @@ Lavc很少会使用低于vqmin值的量化参数。 . .TP .B vqmax=<1\-31> -最大量化参数（第1/2阶段编码），10\-31应该是一个合理的范围（默认值：31）。 +最大量化参数，10\-31应该是一个合理的范围（默认值：31）。 . .TP .B mbqmin=<1\-31> @@ -7298,7 +7320,7 @@ Lavc很少会使用低于vqmin值的量化参数。 . .TP .B vqdiff=<1\-31> -连续的I或P帧之间最大的量化参数差别（第1/2阶段编码）（默认值：3） +连续的I或P帧之间最大的量化参数差别（默认值：3） . .TP .B vmax_b_frames=<0\-4> @@ -7541,7 +7563,7 @@ huffyuv： . .TP .B vbitrate= -指定比特率（第1/2阶段编码）（默认值：800）。 +指定比特率（默认值：800）。 .br .I 警告： 1kbit = 1000 bits @@ -7567,17 +7589,17 @@ vratetol在第二阶段编码中不应设得太大，否则当设置了vrc_(min| . .TP .B vrc_maxrate= -最大比特率，单位为kbit/\:sec（第1/2阶段编码） +最大比特率，单位为kbit/\:sec （默认值：0，无限制） . .TP .B vrc_minrate= -最小比特率，单位为kbit/\:sec（第1/2阶段编码） +最小比特率，单位为kbit/\:sec （默认值：0，无限制） . .TP .B vrc_buf_size= -缓冲大小，单位为kbit（第1/2阶段编码）。 +缓冲大小，单位为kbit。 在MPEG-1/2中该选项同时设置了vbv缓冲的大小，对于VCD请使用327，对于SVCD使用917，而 DVD使用1835。 . @@ -7601,19 +7623,19 @@ DVD使用1835。 . .TP .B vb_qfactor=<\-31.0\-31.0> -B帧和非B帧间的量化参数因数（第1/2阶段编码）（默认值1.25） +B帧和非B帧间的量化参数因数（默认值1.25） . .TP .B vi_qfactor=<\-31.0\-31.0> -I帧和非I帧间的量化参数因数（第1/2阶段编码）（默认值0.8） +I帧和非I帧间的量化参数因数（默认值0.8） . .TP .B vb_qoffset=<\-31.0\-31.0> -B帧和非B帧间的量化参数偏移量（第1/2阶段编码）（默认值1.25） +B帧和非B帧间的量化参数偏移量（默认值1.25） . .TP .B vi_qoffset=<\-31.0\-31.0> -（第1/2阶段编码）（默认值0.0） +（默认值0.0） .br 如果v{b|i}_qfactor > 0 .br @@ -7648,7 +7670,7 @@ lmin= :lmax= :vb_qfactor= -量化参数压缩，vrc_eq选项依赖于该选项（第1/2阶段编码）（默认值：0.5）。 +量化参数压缩，vrc_eq选项依赖于该选项（默认值：0.5）。 例如，假设使用了默认的码率控制方程式，如果vqcomp=1.0，那么码率控制过程中将分配给 每个帧足够的比特数，以使它们在同一个量化参数下编码。 如果vqcomp=0.0，那么码率控制中将分配给每个帧相同的比特数，也就是严格的CBR模式。 @@ -7658,7 +7680,7 @@ lmin= :lmax= :vb_qfactor= -主码率控制方程式（第1/2阶段编码） +主码率控制方程式 .RE .RSs .IPs "1\ \ \ \ " @@ -7731,7 +7753,7 @@ B帧中的平均非内部纹理复杂度 . .TP .B vrc_override= -用户指定的针于影片特定部分（尾声、演职员表……）的质量值（第1/2阶段编码）。 +用户指定的针于影片特定部分（尾声、演职员表……）的质量值。 选项有、、[/, , [/...]]： .PD 0 @@ -7753,7 +7775,7 @@ B帧中的平均非内部纹理复杂度 . .TP .B vqsquish=<0|1> -指定如何使量化参数保持在qmin和qmax之间（第1/2阶段编码）。 +指定如何使量化参数保持在qmin和qmax之间。 .PD 0 .RSs .IPs 0 @@ -8481,6 +8503,10 @@ FIXME：为这个选项写说明文档。 .B skip_threshold=<0\-1000000> FIXME：为这个选项写说明文档。 . +.TP +.B "o\ \ \ \ \ \ " +FIXME：没有说明文档 +. . .SS nuv（\-nuvopts） . @@ -9440,6 +9466,25 @@ denoise3d或hqdn3d之类的视频滤镜来滤除噪声。 有用值的范围是<\-2\-2>（默认值：0）。 . .TP +.B aq_mode=<0\-2> +定议自适应量化模式（AQ）如何分配比特： +.PD 0 +.RSs +.IPs 0 +禁用 +.IPs 1 +避免在帧间转移比特。 +.IPs 2 +在帧间转移比特（依据默认方式）。 +.RE +.PD 1 +. +.TP +.B aq_strength= +控制自适应量化模式（AQ）在平坦和有纹理的区域能减少多少块效应和模糊（默认值：1.0）。 +值为 0.5 将导致较弱的 AQ 和较少的细节，而值为 1.5 则能产生较强的 AQ 和更多的细节。 +. +.TP .B cqm=> 要么使用一个预先定义好的自定义量化矩阵，要么加一个JM格式的矩阵文件。 .PD 0 @@ -9714,6 +9759,10 @@ PAL至NTSC的电视图像化处理 强制使用一个特定的 libav 格式库的分离器。 . .TP +.B "o\ \ \ \ \ \ " +FIXME：没有说明文档 +. +.TP .B probesize= 在侦测阶段所探测的最大数据量。 在MPEG-TS的情况下，这个值指定了所扫描TS包的最大个数。 @@ -9785,6 +9834,10 @@ Sony 数字视频容器格式 当前只对MPEG[12]有意义：单位为秒，对于任意出现的流，输出流参照计时器（SCR）和解 码时间戳（DTS）间的初始差距（流分离至解码间的延迟）。 . +.TP +.B "o\ \ \ \ \ \ " +FIXME：没有说明文档 +. . . .\" -------------------------------------------------------------------------- -- cgit v1.2.3 From 7f68edbc37b85acfd88aaef7f055be0355de2317 Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 4 Jun 2008 09:44:12 +0000 Subject: Remove unnecessary mangle.h #include. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26982 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libvo/osd.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libvo/osd.c b/libvo/osd.c index 9bf0cb2f9d..da7d61fb50 100644 --- a/libvo/osd.c +++ b/libvo/osd.c @@ -10,7 +10,6 @@ #include "mp_msg.h" #include #include "cpudetect.h" -#include "mangle.h" #ifdef ARCH_X86 #define CAN_COMPILE_X86_ASM -- cgit v1.2.3 From e3d4291076010e8ba5bc299722bba50b49ff075c Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 4 Jun 2008 11:27:51 +0000 Subject: Fix some typos and update the Matrox TV output section. The relevant tools are no longer part of the MPlayer source tree. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26983 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/xml/en/video.xml | 39 +++++++++------------------------------ 1 file changed, 9 insertions(+), 30 deletions(-) diff --git a/DOCS/xml/en/video.xml b/DOCS/xml/en/video.xml index a60a894a72..74b4af69bf 100644 --- a/DOCS/xml/en/video.xml +++ b/DOCS/xml/en/video.xml @@ -193,7 +193,7 @@ xv support, but the card itself is very slow, so you better sell it. -There is now a native framebuffer driver for S3 Virge cards similiar to +There is now a native framebuffer driver for S3 Virge cards similar to tdfxfb. Set up your framebuffer (e.g. append "" to your kernel comand line) and use ( and @@ -2347,43 +2347,22 @@ for Matrox G450/G550 TV-out instructions, please see the next section! Using the matroxfb modules in the 2.4 kernels. 2.2 kernels don't have the TV-out feature in them, thus unusable - for this. You have to enable ALL matroxfb-specific feature during + for this. You have to enable ALL matroxfb-specific features during compilation (except MultiHead), and compile them into modules! - You'll also need I2C enabled. + You'll also need to enable I2C and put the tools + matroxset, fbset + and con2fb in your path. - Enter TVout and type - ./compile.sh. Install - TVout/matroxset/matroxset - somewhere into your PATH. + Then load the matroxfb_Ti3026, matroxfb_maven, i2c-matroxfb, + matroxfb_crtc2 modules into your kernel. Your text-mode + console will enter into framebuffer mode (no way back!). - If you don't have fbset installed, put - TVout/fbset/fbset - somewhere into your PATH. - - - If you don't have con2fb installed, put - TVout/con2fb/con2fb - somewhere into your PATH. - - - Then enter into the TVout/ - directory in the MPlayer source, and execute - ./modules as root. Your text-mode console will - enter into framebuffer mode (no way back!). - - - Next, EDIT and run the ./matroxtv script. This will - present you to a very simple menu. Press 2 and - Enter. Now you should have the same picture on your - monitor, and TV. If the TV (PAL by default) - picture has some weird stripes on it, the script wasn't able to set the - resolution correctly (to 640x512 by default). Try other resolutions - from the menu and/or experiment with fbset. + Next, set up your monitor and TV to your liking using the above tools. Yoh. Next task is to make the cursor on tty1 (or whatever) to -- cgit v1.2.3 From bf3e6467e0bd7ec1cb4a0b4d993f9e547c13211a Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 4 Jun 2008 11:32:57 +0000 Subject: Move Matrox TV-out cable instructions into their own section. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26984 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/xml/en/video.xml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/DOCS/xml/en/video.xml b/DOCS/xml/en/video.xml index 74b4af69bf..e2c2fee8c2 100644 --- a/DOCS/xml/en/video.xml +++ b/DOCS/xml/en/video.xml @@ -2403,13 +2403,16 @@ mplayer -vo mga -fs -screenw 640 -screenh 512 filename + + + -Building a Matrox TV-out cable + +Building a Matrox TV-out cable No one takes any responsibility, nor guarantee for any damage caused by this documentation. - Cable for G400 -- cgit v1.2.3 From 12d1c53d733da8211e4c9bbe09baab10a0386d95 Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 4 Jun 2008 11:34:17 +0000 Subject: Move Matrox TV-out cable section to the end of the Matrox chapter. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26985 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/xml/en/video.xml | 52 +++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/DOCS/xml/en/video.xml b/DOCS/xml/en/video.xml index e2c2fee8c2..f61e4fa028 100644 --- a/DOCS/xml/en/video.xml +++ b/DOCS/xml/en/video.xml @@ -2407,32 +2407,6 @@ mplayer -vo mga -fs -screenw 640 -screenh 512 filename - -Building a Matrox TV-out cable - -No one takes any responsibility, nor guarantee for any damage caused -by this documentation. - - -Cable for G400 - -The CRTC2 connector's fourth pin is the composite video signal. The -ground are the sixth, seventh and eighth pins. (info contributed -from Balázs Rácz) - - - -Cable for G450 - -The CRTC2 connector's first pin is the composite video signal. The -ground are the fifth, sixth, seventh, and fifteenth (5, 6, 7, 15) -pins. (info contributed from Balázs Kerekes) - - - - - - Matrox G450/G550 cards @@ -2463,6 +2437,32 @@ The necessary kernel patch and the detailed HOWTO is downloadable from + +Building a Matrox TV-out cable + +No one takes any responsibility, nor guarantee for any damage caused +by this documentation. + + +Cable for G400 + +The CRTC2 connector's fourth pin is the composite video signal. The +ground are the sixth, seventh and eighth pins. (info contributed +from Balázs Rácz) + + + +Cable for G450 + +The CRTC2 connector's first pin is the composite video signal. The +ground are the fifth, sixth, seventh, and fifteenth (5, 6, 7, 15) +pins. (info contributed from Balázs Kerekes) + + + + + + ATI cards -- cgit v1.2.3 From f97e481a302857c00a28093641b3b1c3e657dec2 Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 4 Jun 2008 11:38:44 +0000 Subject: Document VIDIXIVTVALPHA environment variable. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26986 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/man/en/mplayer.1 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1 index a5ae7c902d..e38919c4a9 100644 --- a/DOCS/man/en/mplayer.1 +++ b/DOCS/man/en/mplayer.1 @@ -10693,6 +10693,12 @@ FIXME: Document this. .B VIDIX_CRT FIXME: Document this. . +.TP +.B VIDIXIVTVALPHA +Set this to 'disable' in order to stop the VIDIX driver from controlling +alphablending settings. +You can then manipulate it yourself with 'ivtvfbctl'. +. .SS osdep: . .TP -- cgit v1.2.3 From 6f64126b89a7f784cad4ee124295d1a839ec0376 Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 4 Jun 2008 12:38:45 +0000 Subject: Get rid of needless emphasis. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26987 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/xml/en/documentation.xml | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/DOCS/xml/en/documentation.xml b/DOCS/xml/en/documentation.xml index 9edfb592e5..c019099056 100644 --- a/DOCS/xml/en/documentation.xml +++ b/DOCS/xml/en/documentation.xml @@ -61,13 +61,12 @@ is a lot of valuable information to be found there. MPlayer is a movie player for Linux (runs on -many other Unices, and non-x86 CPUs, see -). +many other Unices, and non-x86 CPUs, see ). It plays most MPEG, VOB, AVI, OGG/OGM, VIVO, ASF/WMA/WMV, QT/MOV/MP4, FLI, RM, NuppelVideo, yuv4mpeg, FILM, RoQ, PVA, Matroska files, supported by many native, XAnim, RealPlayer, and Win32 DLL codecs. You can watch -VideoCD, SVCD, DVD, 3ivx, RealMedia, Sorenson, Theora, -and MPEG-4 (DivX) movies too. Another big +VideoCD, SVCD, DVD, 3ivx, RealMedia, Sorenson, Theora, +and MPEG-4 (DivX) movies too. Another big feature of MPlayer is the wide range of supported output drivers. It works with X11, Xv, DGA, OpenGL, SVGAlib, fbdev, AAlib, libcaca, DirectFB, but you can use GGI and SDL (and this way all @@ -77,8 +76,7 @@ scaling, so you can enjoy movies in fullscreen. MPlayer supports displaying through some hardware MPEG decoder boards, such as the DVB and DXR3/Hollywood+. And what about the nice big -antialiased shaded subtitles -(14 supported types) +antialiased shaded subtitles (14 supported types) with European/ISO 8859-1,2 (Hungarian, English, Czech, etc), Cyrillic, Korean fonts, and the onscreen display (OSD)? @@ -98,13 +96,11 @@ video and audio manipulation. MEncoder (MPlayer's Movie Encoder) is a simple movie encoder, designed to encode MPlayer-playable movies -(AVI/ASF/OGG/DVD/VCD/VOB/MPG/MOV/VIV/FLI/RM/NUV/NET/PVA) +AVI/ASF/OGG/DVD/VCD/VOB/MPG/MOV/VIV/FLI/RM/NUV/NET/PVA to other MPlayer-playable formats (see below). -It can encode with various codecs, like -MPEG-4 (DivX4) +It can encode with various codecs, like MPEG-4 (DivX4) (one or two passes), libavcodec, -PCM/MP3/VBR MP3 -audio. +PCM/MP3/VBR MP3 audio. @@ -118,7 +114,7 @@ audio. libavcodec - Video encoding from V4L compatible TV tuners + Video encoding from V4L compatible TV tuners Encoding/multiplexing to interleaved AVI files with proper index @@ -130,10 +126,7 @@ audio. 1, 2 or 3 pass encoding - VBR MP3 audio - - VBR MP3 audio doesn't always play nicely on windows players! - + VBR MP3 audio PCM audio @@ -154,7 +147,7 @@ audio. rotate, scale, rgb/yuv conversion) - Can encode DVD/VOBsub AND text subtitles + Can encode DVD/VOBsub and text subtitles into the output file -- cgit v1.2.3 From a6971389385b92ddbce638534165e37052e241d6 Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 4 Jun 2008 12:58:01 +0000 Subject: Remove references to removed configure options. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26988 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/xml/en/codecs.xml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/DOCS/xml/en/codecs.xml b/DOCS/xml/en/codecs.xml index 1c4fc2a0bc..860d303f14 100644 --- a/DOCS/xml/en/codecs.xml +++ b/DOCS/xml/en/codecs.xml @@ -174,9 +174,7 @@ default as it offers better speed. /usr/local/include/. - Recompile MPlayer with - - . + Recompile MPlayer. -- cgit v1.2.3 From 51e0f7d1a4ab089c515e93b9435b6a37f7fb9099 Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 4 Jun 2008 13:00:01 +0000 Subject: Remove another reference to a removed configure option. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26989 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/xml/en/containers.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/DOCS/xml/en/containers.xml b/DOCS/xml/en/containers.xml index 352e99dae2..e173bcba43 100644 --- a/DOCS/xml/en/containers.xml +++ b/DOCS/xml/en/containers.xml @@ -512,10 +512,6 @@ shorten and many others. You can find them at the For this feature you need to have XMMS and compile MPlayer with ./configure --enable-xmms. -If that does not work, you might need to set the XMMS -plugin and library path explicitly by way of the - and -options. -- cgit v1.2.3 From 221c74984eb0af151bb319fdda1035f7fa8cdb09 Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 4 Jun 2008 15:54:47 +0000 Subject: Run the whole documentation through ispell. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26990 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/xml/en/audio.xml | 2 +- DOCS/xml/en/bugreports.xml | 2 +- DOCS/xml/en/bugs.xml | 2 +- DOCS/xml/en/cd-dvd.xml | 12 +++++------ DOCS/xml/en/codecs.xml | 4 ++-- DOCS/xml/en/containers.xml | 8 +++---- DOCS/xml/en/documentation.xml | 14 ++++++------ DOCS/xml/en/encoding-guide.xml | 48 +++++++++++++++++++++--------------------- DOCS/xml/en/faq.xml | 2 +- DOCS/xml/en/history.xml | 4 ++-- DOCS/xml/en/install.xml | 6 +++--- DOCS/xml/en/mencoder.xml | 4 ++-- DOCS/xml/en/ports.xml | 8 +++---- DOCS/xml/en/skin.xml | 4 ++-- DOCS/xml/en/usage.xml | 4 ++-- DOCS/xml/en/video.xml | 10 ++++----- 16 files changed, 67 insertions(+), 67 deletions(-) diff --git a/DOCS/xml/en/audio.xml b/DOCS/xml/en/audio.xml index 77a815012e..9285f9c662 100644 --- a/DOCS/xml/en/audio.xml +++ b/DOCS/xml/en/audio.xml @@ -24,7 +24,7 @@ efficient as MPlayer's. Using MPlayer with a properly written audio -driver will never result in A/V desyncs related to the audio, except +driver will never result in A/V desynchronisation related to the audio, except only with very badly created files (check the man page for workarounds). diff --git a/DOCS/xml/en/bugreports.xml b/DOCS/xml/en/bugreports.xml index cb5204024c..6891891b40 100644 --- a/DOCS/xml/en/bugreports.xml +++ b/DOCS/xml/en/bugreports.xml @@ -18,7 +18,7 @@ we request and follow the instructions in this document closely. -Report security releated bugs +Report security related bugs In case you have found an exploitable bug and you would like to do the diff --git a/DOCS/xml/en/bugs.xml b/DOCS/xml/en/bugs.xml index 39266d8318..35e0b55c1b 100644 --- a/DOCS/xml/en/bugs.xml +++ b/DOCS/xml/en/bugs.xml @@ -88,7 +88,7 @@ -Audio delay/de-sync specific to one or a few files +Audio delay/desync specific to one or a few files diff --git a/DOCS/xml/en/cd-dvd.xml b/DOCS/xml/en/cd-dvd.xml index 0c200212b5..fafc76410d 100644 --- a/DOCS/xml/en/cd-dvd.xml +++ b/DOCS/xml/en/cd-dvd.xml @@ -222,11 +222,11 @@ form 1 and 2 tracks: The first track is in mode 2 form 2 format which means it uses L2 - error correction. The track contains an ISO-9660 filesystem with 2048 - bytes/sector. This filesystem contains VCD metadata information, as + error correction. The track contains an ISO-9660 file system with 2048 + bytes/sector. This file system contains VCD metadata information, as well as still frames often used in menus. MPEG segments for menus can also be stored in this first track, but the MPEGs have to be broken up - into a series of 150-sector chunks. The ISO-9660 filesystem may + into a series of 150-sector chunks. The ISO-9660 file system may contain other files or programs that are not essential for VCD operation. @@ -238,7 +238,7 @@ form 1 and 2 tracks: sector at the loss of some error correction. It is also legal to have CD-DA tracks in a VCD after the first track as well. On some operating systems there is some trickery that goes on to make - these non-ISO-9660 tracks appear in a filesystem. On other operating + these non-ISO-9660 tracks appear in a file system. On other operating systems like GNU/Linux this is not the case (yet). Here the MPEG data cannot be mounted. As most movies are inside this kind of track, you should try @@ -246,7 +246,7 @@ form 1 and 2 tracks: - There exist VCD disks without the first track (single track and no filesystem + There exist VCD disks without the first track (single track and no file system at all). They are still playable, but cannot be mounted. @@ -270,7 +270,7 @@ tracks (Windows does not allow raw device access to applications at all). Under Linux you cannot copy or play such files (they contain garbage). Under Windows it is possible as its iso9660 driver emulates the raw reading of tracks in this file. To play a .DAT file you need the kernel driver which can -be found in the Linux version of PowerDVD. It has a modified iso9660 filesystem +be found in the Linux version of PowerDVD. It has a modified iso9660 file system (vcdfs/isofs-2.4.X.o) driver, which is able to emulate the raw tracks through this shadow .DAT file. If you mount the disc using their driver, you can copy and even play .DAT files with diff --git a/DOCS/xml/en/codecs.xml b/DOCS/xml/en/codecs.xml index 860d303f14..36f4a2e0e9 100644 --- a/DOCS/xml/en/codecs.xml +++ b/DOCS/xml/en/codecs.xml @@ -281,7 +281,7 @@ but if you are interested in a brief overview, you may want to read libavcodec has had at least minimally usable H.264 decoding since around July 2004, however major changes and improvements have been implemented since -that time, both in terms of more functionalities supported and in +that time, both in terms of more functionality supported and in terms of improved CPU usage. Just to be certain, it is always a good idea to use a recent Subversion checkout. @@ -382,7 +382,7 @@ satisfied the requirements for x264. Voxware audio (using DirectShow DLL) - alaw and ulaw, various gsm, adpcm and pcm formats and other simple old + alaw and ulaw, various GSM, ADPCM and PCM formats and other simple old audio codecs diff --git a/DOCS/xml/en/containers.xml b/DOCS/xml/en/containers.xml index e173bcba43..6d0d736477 100644 --- a/DOCS/xml/en/containers.xml +++ b/DOCS/xml/en/containers.xml @@ -83,7 +83,7 @@ functional. -One important feature of MPGs is that they have a field to describe the +One important feature of MPEG files is that they have a field to describe the aspect ratio of the video stream within. For example SVCDs have 480x480 resolution video, and in the header that field is set to 4:3, so that it is played at 640x480. AVI files often lack this field, so they have to be @@ -319,8 +319,8 @@ Return to Castle Wolfenstein. OGG/OGM files -This is a new fileformat from -Xiphophorus. +This is a new file format from the +Xiph.Org Foundation. It can contain any video or audio codec, CBR or VBR. You'll need libogg and libvorbis installed before @@ -503,7 +503,7 @@ options to cdparanoia. MPlayer can use XMMS input plugins to play many file formats. There are plugins for SNES game tunes, SID -tunes (from Commodore 64), many Amiga formats, .xm, .it, VQF, musepack, Bonk, +tunes (from Commodore 64), many Amiga formats, .xm, .it, VQF, Musepack, Bonk, shorten and many others. You can find them at the XMMS input plugin page. diff --git a/DOCS/xml/en/documentation.xml b/DOCS/xml/en/documentation.xml index c019099056..13ee22989a 100644 --- a/DOCS/xml/en/documentation.xml +++ b/DOCS/xml/en/documentation.xml @@ -62,15 +62,15 @@ is a lot of valuable information to be found there. MPlayer is a movie player for Linux (runs on many other Unices, and non-x86 CPUs, see ). -It plays most MPEG, VOB, AVI, OGG/OGM, VIVO, ASF/WMA/WMV, QT/MOV/MP4, FLI, RM, +It plays most MPEG, VOB, AVI, Ogg/OGM, VIVO, ASF/WMA/WMV, QT/MOV/MP4, FLI, RM, NuppelVideo, yuv4mpeg, FILM, RoQ, PVA, Matroska files, supported by many native, XAnim, RealPlayer, and Win32 DLL codecs. You can watch -VideoCD, SVCD, DVD, 3ivx, RealMedia, Sorenson, Theora, -and MPEG-4 (DivX) movies too. Another big +Video CD, SVCD, DVD, 3ivx, RealMedia, Sorenson, Theora, +and MPEG-4 (DivX) movies, too. Another big feature of MPlayer is the wide range of supported output drivers. It works with X11, Xv, DGA, OpenGL, SVGAlib, fbdev, AAlib, libcaca, DirectFB, but you can use GGI and SDL (and this way all -their drivers) and some lowlevel card-specific drivers (for Matrox, 3Dfx and +their drivers) and some low level card-specific drivers (for Matrox, 3Dfx and Radeon, Mach64, Permedia3) too! Most of them support software or hardware scaling, so you can enjoy movies in fullscreen. MPlayer supports displaying through some @@ -106,7 +106,7 @@ PCM/MP3/VBR MP3 audio. <application>MEncoder</application> features - Encoding from the wide range of fileformats and decoders of + Encoding from the wide range of file formats and decoders of MPlayer @@ -135,7 +135,7 @@ PCM/MP3/VBR MP3 audio. Stream copying - Input A/V synchronizing (PTS-based, can be disabled with + Input A/V synchronizing (pts-based, can be disabled with option) @@ -144,7 +144,7 @@ PCM/MP3/VBR MP3 audio. Using our very powerful filter system (crop, expand, flip, postprocess, - rotate, scale, rgb/yuv conversion) + rotate, scale, RGB/YUV conversion) Can encode DVD/VOBsub and text subtitles diff --git a/DOCS/xml/en/encoding-guide.xml b/DOCS/xml/en/encoding-guide.xml index 2072cdfc6f..a5f5d6f8fd 100644 --- a/DOCS/xml/en/encoding-guide.xml +++ b/DOCS/xml/en/encoding-guide.xml @@ -457,7 +457,7 @@ the other for the blue-yellow axis). Even if your movie width and height are not multiples of 16, the encoder will use enough 16x16 macroblocks to cover the whole picture area, and the extra space will go to waste. -So in the interests of maximizing quality at a fixed filesize, it is +So in the interests of maximizing quality at a fixed file size, it is a bad idea to use dimensions that are not multiples of 16. @@ -1212,7 +1212,7 @@ Again, it is a matter of putting those bits to better use: why waste them encoding noise when you can just add that noise back in during playback? Increasing the parameters for will further improve compressibility, but if you increase the values too much, you -risk degrading the image visibily. The suggested values above +risk degrading the image visibly. The suggested values above () are quite conservative; you should feel free to experiment with higher values and observe the results for yourself. @@ -1558,7 +1558,7 @@ to get proper sync. You need to have MEncoder process the sound. -You can for example copy the orignal soundtrack during the encode with +You can for example copy the original soundtrack during the encode with or convert it to a "light" 4 kHz mono WAV PCM with . Otherwise, in some cases, it will generate a video file that will not sync @@ -1571,11 +1571,11 @@ cut audio at these points. However MPlayer cannot do that, so if you demux the AC-3 audio and encode it with a separate app (or dump it to PCM with MPlayer), the splices will be left incorrect -and the only way to correct them is to drop/dup video frames at the +and the only way to correct them is to drop/duplicate video frames at the splice. As long as MEncoder sees the audio when it is encoding the video, it can do this dropping/duping (which is usually OK -since it takes place at full black/scenechange), but if +since it takes place at full black/scene change), but if MEncoder cannot see the audio, it will just process all frames as-is and they will not fit the final audio stream when you for example merge your audio and video track into a Matroska file. @@ -1830,7 +1830,7 @@ numbers to 60, 30, and 24. Strictly speaking, all those numbers are approximations. Black and white NTSC video was exactly 60 fields per second, but 60000/1001 -was later chosen to accomodate color data while remaining compatible +was later chosen to accommodate color data while remaining compatible with contemporary black and white televisions. Digital NTSC video (such as on a DVD) is also 60000/1001 fields per second. From this, interlaced and telecined video are derived to be 30000/1001 frames @@ -2413,7 +2413,7 @@ duration/location of each type. It is safe to use (along with ) on progressive video, and is usually a good idea unless the source has been definitively verified to be entirely progressive. - The performace loss is small for most cases. On a bare-minimum encode, + The performance loss is small for most cases. On a bare-minimum encode, causes MEncoder to be 50% slower. Adding sound processing and advanced overshadows that difference, bringing the performance @@ -2877,7 +2877,7 @@ That would probably be nice, but unfortunately hard to implement as different encoding options yield different quality results depending on the source material. That is because compression depends on the visual properties of the video in question. -For example, anime and live action have very different properties and +For example, Anime and live action have very different properties and thus require different options to obtain optimum encoding. The good news is that some options should never be left out, like , , and . @@ -2917,7 +2917,7 @@ See below for a detailed description of common encoding options. Experiment with values of 0 (default), 2 (hadamard), 3 (dct), and 6 (rate distortion). 0 is fastest, and sufficient for precmp. - For cmp and subcmp, 2 is good for anime, and 3 is good for live action. + For cmp and subcmp, 2 is good for Anime, and 3 is good for live action. 6 may or may not be slightly better, but is slow. @@ -2961,7 +2961,7 @@ See below for a detailed description of common encoding options. when the change in a block is less than the threshold you specify, and in such a case, to just encode the block as "no change". This saves bits and perhaps speeds up encoding. vlelim=-4 and vcelim=9 - seem to be good for live movies, but seem not to help with anime; + seem to be good for live movies, but seem not to help with Anime; when encoding animation, you should probably leave them unchanged. @@ -2970,7 +2970,7 @@ See below for a detailed description of common encoding options. therefore this option comes with an overhead as more information will be stored in the encoded file. The compression gain/loss depends on the movie, but it is usually not very - effective on anime. + effective on Anime. qpel always incurs a significant cost in CPU decode time (+25% in practice). @@ -3235,7 +3235,7 @@ this parameter (refer to the man page for the possible values) as different functions can have a large impact on quality depending on the source material. For example, if you find libavcodec produces too much -blocky artifacting, you could try selecting the experimental NSSE as +blocky artifacts, you could try selecting the experimental NSSE as comparison function via . @@ -3376,7 +3376,7 @@ the following section puzzles you. hq_ac Activates a better coefficient cost estimation method, which slightly - reduces filesize by around 0.15 to 0.19% (which corresponds to less + reduces file size by around 0.15 to 0.19% (which corresponds to less than 0.01dB PSNR increase), while having a negligible impact on speed. It is therefore recommended to always leave it on. @@ -3409,7 +3409,7 @@ the following section puzzles you. information into account, whereas alone only uses luma (grayscale). This slows down encoding by 5-10% but improves visual quality - quite a bit by reducing blocking effects and reduces filesize by + quite a bit by reducing blocking effects and reduces file size by around 1.3%. If you are looking for speed, you should disable this option before starting to consider reducing . @@ -3703,7 +3703,7 @@ The following table shows what each profile supports. X - Quaterpixel + Quarterpixel @@ -3986,7 +3986,7 @@ random differences in the achieved bitrate. quality: You will probably lose well under 0.1dB PSNR, which should be much too small of a difference to see. However, different values of can - occasionally affect frametype decision. + occasionally affect frame type decision. Most likely, these are rare outlying cases, but if you want to be pretty sure, consider whether your video has either fullscreen repetitive flashing patterns or very large temporary @@ -4070,7 +4070,7 @@ random differences in the achieved bitrate. The speed penalty of adaptive B-frames is currently rather modest, but so is the potential quality gain. It usually does not hurt, however. - Note that this only affects speed and frametype decision on the + Note that this only affects speed and frame type decision on the first pass. and have no effect on subsequent passes. @@ -4149,7 +4149,7 @@ random differences in the achieved bitrate. which, in isolation, requires about 2500kbps in order to look decent. Immediately following it is a much less demanding 60-second scene that looks good at 300kbps. Suppose you ask for 1400kbps on the theory - that this is enough to accomodate both scenes. Single pass ratecontrol + that this is enough to accommodate both scenes. Single pass ratecontrol will make a couple of "mistakes" in such a case. First of all, it will target 1400kbps in both segments. The first segment may end up heavily overquantized, causing it to look unacceptably and unreasonably @@ -4196,7 +4196,7 @@ random differences in the achieved bitrate. pass will both read the statistics from the previous pass, and write its own statistics. An additional pass following this one will have a very good base from which to make highly accurate predictions of - framesizes at a chosen quantizer. In practice, the overall quality + frame sizes at a chosen quantizer. In practice, the overall quality gain from this is usually close to zero, and quite possibly a third pass will result in slightly worse global PSNR than the pass before it. In typical usage, three passes help if you get either bad bitrate @@ -4296,7 +4296,7 @@ random differences in the achieved bitrate. If your H.264 encodes look too blurry or smeared, try playing with when you play your encoded movie. should conceal most mild - artifacting. + artifacts. It will almost certainly look better than the results you would have gotten just by fiddling with the deblocking filter. @@ -4457,7 +4457,7 @@ if a codec fails or gives wrong output. m3jpeg32.dll - Morgan Motion JPEG Codec (MJPG) + Morgan Motion JPEG Codec (MJPEG) 1cd13fff5960aa2aae43790242c323b1 @@ -4828,7 +4828,7 @@ me=umh:partitions=all:trellis=1:qp_step=4:qcomp=0.7:direct_pred=auto:keyint=300 mplayer narnia.avi -dumpaudio -dumpfile narnia.aac mplayer narnia.avi -dumpvideo -dumpfile narnia.h264 - The filenames are important; mp4creator + The file names are important; mp4creator requires that AAC audio streams be named .aac and H.264 video streams be named .h264. @@ -5076,7 +5076,7 @@ The GOP size is set using the option. VCD video is required to be CBR at 1152 kbps. -This highly limiting constraint also comes along with an extremly low vbv +This highly limiting constraint also comes along with an extremely low vbv buffer size of 327 kilobits. SVCD allows varying video bitrates up to 2500 kbps, and a somewhat less restrictive vbv buffer size of 917 kilobits is allowed. @@ -5126,7 +5126,7 @@ DVD (with timestamps on every frame, if possible): DVD with NTSC Pullup: -of mpeg -mpegopts format=dvd:tsaf:telecine -ofps 24000/1001 This allows 24000/1001 fps progressive content to be encoded at 30000/1001 -fps whilst maintaing DVD-compliance. +fps whilst maintaining DVD-compliance. diff --git a/DOCS/xml/en/faq.xml b/DOCS/xml/en/faq.xml index 1c3f269222..7f1f781787 100644 --- a/DOCS/xml/en/faq.xml +++ b/DOCS/xml/en/faq.xml @@ -831,7 +831,7 @@ What about DVD navigation/menus? architectural limitations that prevent proper handling of still images and interactive content. If you want to have fancy menus, you will have to use another player like xine, -vlc or Ogle. +VLC or Ogle. If you want to see DVD navigation in MPlayer you will have to implement it yourself, but be aware that it is a major undertaking. diff --git a/DOCS/xml/en/history.xml b/DOCS/xml/en/history.xml index 521ff2aeba..fc111f8c91 100644 --- a/DOCS/xml/en/history.xml +++ b/DOCS/xml/en/history.xml @@ -106,7 +106,7 @@ audio), even more stable than ever, and so on. It's a MUST! Hmm. Release again. Tons of new features, beta GUI version, bugs fixed, new vo and ao drivers, ported to many systems, including -opensource DivX codecs and much more. Try it! +open source DivX codecs and much more. Try it! @@ -115,7 +115,7 @@ opensource DivX codecs and much more. Try it! MPlayer 0.60 "The RTFMCounter": Jan 3, 2002 -MOV/VIVO/RM/FLI/NUV fileformats support, native CRAM, Cinepak, +MOV/VIVO/RM/FLI/NUV file formats support, native CRAM, Cinepak, ADPCM codecs, and support for XAnim's binary codecs; DVD subtitles support, first release of MEncoder, TV grabbing, cache, liba52, countless fixes. diff --git a/DOCS/xml/en/install.xml b/DOCS/xml/en/install.xml index 4a93e66e73..6821df7e0d 100644 --- a/DOCS/xml/en/install.xml +++ b/DOCS/xml/en/install.xml @@ -287,7 +287,7 @@ ln -s $PREFIX/share/mplayer/arial-24 $PREFIX/share/mp Fonts should have an appropriate font.desc file -which maps unicode font positions to the actual code page of the +which maps Unicode font positions to the actual code page of the subtitle text. Another solution is to have UTF-8-encoded subtitles and use the option or give the subtitles file the same name as your video file with a .utf @@ -301,7 +301,7 @@ extension and have it in the same directory as the video file. OSD menu -MPlayer has a completely user definiable +MPlayer has a completely user-definable OSD Menu interface. @@ -368,7 +368,7 @@ There are three timing methods in MPlayer. but a properly set up kernel is required. If you are running kernel 2.4.19pre8 or later you can adjust the maximum RTC frequency for normal users through the /proc - filesystem. Use one of the following two commands to + file system. Use one of the following two commands to enable RTC for normal users: echo 1024 > /proc/sys/dev/rtc/max-user-freq sysctl dev/rtc/max-user-freq=1024 diff --git a/DOCS/xml/en/mencoder.xml b/DOCS/xml/en/mencoder.xml index 48c6577432..b52ada1986 100644 --- a/DOCS/xml/en/mencoder.xml +++ b/DOCS/xml/en/mencoder.xml @@ -300,7 +300,7 @@ You can use the option for this purpose. For example, 1-4 will only encode chapters 1 through 4 from the DVD. This is especially useful if you will be making a 1400 MB encode -targetted for two CDs, since you can ensure the split occurs exactly +targeted for two CDs, since you can ensure the split occurs exactly at a chapter boundary rather than in the middle of a scene. @@ -478,7 +478,7 @@ all passes are run with target bitrates that do not differ very much. Rescaling movies -Often the need to resize movie images' size emerges. Its reasons can be +Often the need to resize movie images emerges. The reasons can be many: decreasing file size, network bandwidth, etc. Most people even do rescaling when converting DVDs or SVCDs to DivX AVI. If you wish to rescale, read the Preserving aspect ratio section. diff --git a/DOCS/xml/en/ports.xml b/DOCS/xml/en/ports.xml index 0c8d23aebe..b752941c1e 100644 --- a/DOCS/xml/en/ports.xml +++ b/DOCS/xml/en/ports.xml @@ -68,7 +68,7 @@ from Livna repository. Mandrake/Mandriva RPM packages are available from the P.L.F.. -SuSE used to include a crippled version of MPlayer +SUSE used to include a crippled version of MPlayer in their distribution. They have removed it in their latest releases. You can get working RPMs from links2linux.de. @@ -325,12 +325,12 @@ you may not be able to play DVD discs larger than 4 GB: - A similar bug is present in the hsfs(7FS) filesystem code (AKA ISO9660), + A similar bug is present in the hsfs(7FS) file system code (AKA ISO9660), hsfs may not not support partitions/disks larger than 4GB, all data is accessed modulo 4GB (). The hsfs problem can be fixed by installing - patch 109764-04 (sparc) / 109765-04 (x86). + patch 109764-04 (SPARC) / 109765-04 (x86). @@ -768,7 +768,7 @@ Later examples will be based on MacPorts. For instance, to compile MPlayer with OSD support: -sudo port install pkgconfig +sudo port install pkg-config This will install pkg-config, which is a system for managing library compile/link flags. MPlayer's configure script diff --git a/DOCS/xml/en/skin.xml b/DOCS/xml/en/skin.xml index 278279b708..2be4e940d4 100644 --- a/DOCS/xml/en/skin.xml +++ b/DOCS/xml/en/skin.xml @@ -1107,14 +1107,14 @@ menu entries. evLoadSubtitle - Loads a subtitle file (with the fileselector) + Loads a subtitle file (with the file selector). evLoadAudioFile - Loads an audio file (with the fileselector) + Loads an audio file (with the file selector). diff --git a/DOCS/xml/en/usage.xml b/DOCS/xml/en/usage.xml index 11d8d2356f..9fc3cdac4e 100644 --- a/DOCS/xml/en/usage.xml +++ b/DOCS/xml/en/usage.xml @@ -291,7 +291,7 @@ ENTER pt_step 1 1