# HG changeset patch # User diego # Date 1067180297 0 # Node ID 252fb0cf331a46d1a779e049141b7c05e83f66a3 # Parent 8ba8ec1293e750e7c2ee50ae1a5d902fe12043e1 spelling fixes, mostly by diff -r 8ba8ec1293e7 -r 252fb0cf331a DOCS/man/en/mplayer.1 --- a/DOCS/man/en/mplayer.1 Sun Oct 26 13:43:30 2003 +0000 +++ b/DOCS/man/en/mplayer.1 Sun Oct 26 14:58:17 2003 +0000 @@ -2173,7 +2173,7 @@ .TP .B \-oldpp (OBSOLETE) Use the opendivx postprocessing code instead of the internal one. -Superceded by \-pp, the internal postprocessing offers better +Superseded by \-pp, the internal postprocessing offers better quality and performance. The valid range of \-oldpp values varies by codec, mostly diff -r 8ba8ec1293e7 -r 252fb0cf331a DOCS/man/pl/mplayer.1 --- a/DOCS/man/pl/mplayer.1 Sun Oct 26 13:43:30 2003 +0000 +++ b/DOCS/man/pl/mplayer.1 Sun Oct 26 14:58:17 2003 +0000 @@ -403,7 +403,7 @@ ilo¶ci pamiêci. .TP .B \-bandwidth -Okre¶l maksymalny bandwith (bufor) dla strumieniowania sieciowego (dla serwerów +Okre¶l maksymalny bandwidth (bufor) dla strumieniowania sieciowego (dla serwerów bêdzie to w stanie przes³aæ zawarto¶æ ró¿nych bitrataów) W pe³ni u¿yteczne je¶li chcesz odl±daæ na ¿ywo media ze stumieni przy wolnym po³±czeniu. .TP diff -r 8ba8ec1293e7 -r 252fb0cf331a DOCS/tech/encoding-tips.txt --- a/DOCS/tech/encoding-tips.txt Sun Oct 26 13:43:30 2003 +0000 +++ b/DOCS/tech/encoding-tips.txt Sun Oct 26 14:58:17 2003 +0000 @@ -220,7 +220,7 @@ bits (i.e. 900kbps is 900000)) This way it apeared that the minimum bits per block is ~40, very -good results are with ~50, and everything above 60 is a waste of bandwith. +good results are with ~50, and everything above 60 is a waste of bandwidth. And what's actually funny is that it was independant of codec used. The results were exactly the same, whether I used DIV3 (with tricky nandub's magick), ffmpeg odivx, DivX5 on Windows or XviD. diff -r 8ba8ec1293e7 -r 252fb0cf331a DOCS/tech/playtree --- a/DOCS/tech/playtree Sun Oct 26 13:43:30 2003 +0000 +++ b/DOCS/tech/playtree Sun Oct 26 14:58:17 2003 +0000 @@ -56,8 +56,8 @@ When your tree is ready you can then use play_tree_cleanup to remove all unuseful entries. -If you want to load a playlist you can use parse_playtree wich take a stream_t -as argument or parse_playlist_file wich take a filename as argument. +If you want to load a playlist you can use parse_playtree which take a stream_t +as argument or parse_playlist_file which take a filename as argument. Both function will return NULL in case of failure or a new (cleaned) tree that you can add somewhere in your tree. @@ -74,8 +74,8 @@ This is an iterator used to go trough the tree. It handle itself loop of list and setting mplayer config according to the params of each entry. -It's created with play_tree_iter_new wich take as argument a play_tree_t -and an m_config_t wich is then used to set/unset the params of each entry. +It's created with play_tree_iter_new which take as argument a play_tree_t +and an m_config_t which is then used to set/unset the params of each entry. After creation the iter point to nothing, you should init with a first step. To go to another entry in the list you should use play_tree_iter_step. The second argument is the direction of the step : positive value go frontward, @@ -90,7 +90,7 @@ (( Note : I must add a PLAY_TREE_ITER_BEGINING for the begining. Don't know what it will return in a such case. PLAY_TREE_ITER_ERROR ? )) -There is also play_tree_iter_up_step wich can be used to break a loop or skip +There is also play_tree_iter_up_step which can be used to break a loop or skip the current list. The argument are the same than play_tree_iter_step. The difference is that it go back to parent of the current list, and then step according to the arguments. @@ -99,7 +99,7 @@ play_tree_iter_get_file to get the file. If you call it more than one time it will return the next file for this entry or loop trough the list if no more file are available. You can now how many files are available using -iter->num_files and wich one it returned using iter->file. +iter->num_files and which one it returned using iter->file. In case the entry is a DVD, VCD or TV channel the returned string is not a filename but "DVD title x", "VCD track x" or "TV channel x". To distinc those case from a normal file you can check iter->tree->entry_type. @@ -116,7 +116,7 @@ Ok, that's all for now. To have some exemples look into mplayer.c ;) First just after config parsing, the iterator is created there. Also after stream opening, in case the stream is a playlist it replace the -entry wich contained the playlist by the result of the parsing. +entry which contained the playlist by the result of the parsing. In the event handeling it check if a step can be done, etc. And finnaly at the end it go the next entry. diff -r 8ba8ec1293e7 -r 252fb0cf331a DOCS/xml/en/audio.xml --- a/DOCS/xml/en/audio.xml Sun Oct 26 13:43:30 2003 +0000 +++ b/DOCS/xml/en/audio.xml Sun Oct 26 14:58:17 2003 +0000 @@ -119,7 +119,7 @@ Linux sound drivers are primarily provided by the free version of OSS. -These drivers have been superceded by ALSA +These drivers have been superseded by ALSA (Advanced Linux Sound Architecture) in the 2.5 development series. If your distribution does not already use ALSA you may wish to try their drivers if you experience sound problems. ALSA drivers are generally diff -r 8ba8ec1293e7 -r 252fb0cf331a DOCS/xml/en/formats.xml --- a/DOCS/xml/en/formats.xml Sun Oct 26 13:43:30 2003 +0000 +++ b/DOCS/xml/en/formats.xml Sun Oct 26 14:58:17 2003 +0000 @@ -355,7 +355,7 @@ Standard GIF files contain 24-bit RGB frames with at most an 8-bit indexed -pallete. These frames are usually LZW-compressed, although some GIF encoders +palette. These frames are usually LZW-compressed, although some GIF encoders produce uncompressed frames to avoid patent issues with LZW compression. diff -r 8ba8ec1293e7 -r 252fb0cf331a DOCS/xml/en/install.xml --- a/DOCS/xml/en/install.xml Sun Oct 26 13:43:30 2003 +0000 +++ b/DOCS/xml/en/install.xml Sun Oct 26 14:58:17 2003 +0000 @@ -466,7 +466,7 @@ Just exec fakeroot debian/rules binary in MPlayer's root directory. See -Debian packaging for detailled instructions. +Debian packaging for detailed instructions. @@ -499,7 +499,7 @@ The GUI needs GTK 1.2.x (it isn't fully GTK, but the panels are). The skins are stored in PNG format, so GTK, libpng -(and their devel stuff, usualy called gtk-dev +(and their devel stuff, usually called gtk-dev and libpng-dev) has to be installed. You can build it by specifying during ./configure. Then, to turn on GUI mode, you have to diff -r 8ba8ec1293e7 -r 252fb0cf331a DOCS/xml/en/mencoder.xml --- a/DOCS/xml/en/mencoder.xml Sun Oct 26 13:43:30 2003 +0000 +++ b/DOCS/xml/en/mencoder.xml Sun Oct 26 14:58:17 2003 +0000 @@ -411,7 +411,7 @@ MEncoder is capable of extracting subtitles from -a DVD into Vobsub fomat files. They consist of a pair of files ending in +a DVD into Vobsub formatted files. They consist of a pair of files ending in .idx and .sub and are usually packaged in a single .rar archive. MPlayer can play these with the diff -r 8ba8ec1293e7 -r 252fb0cf331a DOCS/xml/en/ports.xml --- a/DOCS/xml/en/ports.xml Sun Oct 26 13:43:30 2003 +0000 +++ b/DOCS/xml/en/ports.xml Sun Oct 26 14:58:17 2003 +0000 @@ -148,7 +148,7 @@ The configure script tries to find out, which assembler program is used by your "gcc" command (in case the autodetection -fails, use the +fails, use the option to tell the configure script where it can find GNU "as" on your system). diff -r 8ba8ec1293e7 -r 252fb0cf331a DOCS/xml/en/tvinput.xml --- a/DOCS/xml/en/tvinput.xml Sun Oct 26 13:43:30 2003 +0000 +++ b/DOCS/xml/en/tvinput.xml Sun Oct 26 14:58:17 2003 +0000 @@ -186,7 +186,7 @@ This will additionally rescale the image to 384x288 and compresses the video with the bitrate of 350kbps in high quality mode. The vqmax option -looses the quantizer and allows the video compressor to actualy reach so +looses the quantizer and allows the video compressor to actually reach so low bitrate even at the expense of the quality. This can be used for capturing long TV series, where the video quality isn't so important. diff -r 8ba8ec1293e7 -r 252fb0cf331a DOCS/xml/en/usage.xml --- a/DOCS/xml/en/usage.xml Sun Oct 26 13:43:30 2003 +0000 +++ b/DOCS/xml/en/usage.xml Sun Oct 26 14:58:17 2003 +0000 @@ -435,9 +435,9 @@ stream type from a remote host. The main purpose of this feature is to make it possible to directly use the CD or DVD drive of another computer on the network (provided you have the required bandwidth). On the downside some -stream type (currently TV and MF) are not useable remotely because they are +stream type (currently TV and MF) are not usable remotely because they are implemented at the demuxer level. It's sad for MF but TV stream would anyway -require an insane amount of bandwith. +require an insane amount of bandwidth. @@ -466,14 +466,14 @@ mplayer -cache 5000 mpst://servername//usr/local/movies/lol.avi -Note that paths wich aren't starting with a / will be relative to +Note that paths which aren't starting with a / will be relative to the directory where the server is running. The option is not needed but highly recommended. Be aware that currently the server is not secure at all. So don't complain -about the numerous exploits wich are possible through this. Instead send +about the numerous exploits which are possible through this. Instead send some (good) patch to make it better or start writing your own server. diff -r 8ba8ec1293e7 -r 252fb0cf331a DOCS/xml/en/video.xml --- a/DOCS/xml/en/video.xml Sun Oct 26 13:43:30 2003 +0000 +++ b/DOCS/xml/en/video.xml Sun Oct 26 14:58:17 2003 +0000 @@ -1511,7 +1511,7 @@ wmv7, wmv8 and some others. Please note that this is only a temporal inconvenience. The usage syntax is as follows: - mplayer -vf formay=uyvy -vc divxds divx3file.avi + mplayer -vf format=uyvy -vc divxds divx3file.avi @@ -1522,7 +1522,7 @@ framebuffer or X magic whatsoever. For this purpose, we'll have to use the video output, as the following example shows: - mplayer -vf formay=uyvy -vc divxds -vo cvidix example.avi + mplayer -vf format=uyvy -vc divxds -vo cvidix example.avi diff -r 8ba8ec1293e7 -r 252fb0cf331a DOCS/xml/es/video.xml --- a/DOCS/xml/es/video.xml Sun Oct 26 13:43:30 2003 +0000 +++ b/DOCS/xml/es/video.xml Sun Oct 26 14:58:17 2003 +0000 @@ -1544,7 +1544,7 @@ wmv7, wmv8 y algunos otros. Por favor tenga en cuenta que esto es solo algo temporal. La sintaxis de uso es la siguiente: - mplayer -vf formay=uyvy -vc divxds archivodivx3.avi + mplayer -vf format=uyvy -vc divxds archivodivx3.avi @@ -1555,7 +1555,7 @@ - sin framebuffer o X magic ni nada. Para conseguir esto, se ha de usar la salida de video , como muestra el siguiente ejemplo: - mplayer -vf formay=uyvy -vc divxds -vo cvidix ejemplo.avi + mplayer -vf format=uyvy -vc divxds -vo cvidix ejemplo.avi diff -r 8ba8ec1293e7 -r 252fb0cf331a DOCS/xml/fr/video.xml --- a/DOCS/xml/fr/video.xml Sun Oct 26 13:43:30 2003 +0000 +++ b/DOCS/xml/fr/video.xml Sun Oct 26 14:58:17 2003 +0000 @@ -1485,7 +1485,7 @@ et quelques autres. Veuillez noter que ce n'est qu'un inconfort provisoire. La syntaxe est la suivante: - mplayer -vf formay=uyvy -vc divxds fichierdivx3.avi + mplayer -vf format=uyvy -vc divxds fichierdivx3.avi @@ -1496,7 +1496,7 @@ - avec aucun framebuffer ou X. Pour ce faire, nous aurons besoin d'utiliser la sortie , comme le montre l'exemple suivant: - mplayer -vf formay=uyvy -vc divxds -vo cvidix exemple.avi + mplayer -vf format=uyvy -vc divxds -vo cvidix exemple.avi diff -r 8ba8ec1293e7 -r 252fb0cf331a DOCS/xml/ru/ports.xml --- a/DOCS/xml/ru/ports.xml Sun Oct 26 13:43:30 2003 +0000 +++ b/DOCS/xml/ru/ports.xml Sun Oct 26 14:58:17 2003 +0000 @@ -156,7 +156,7 @@ óËÒÉÐÔ configure ÐÙÔÁÅÔÓÑ ÏÂÎÁÒÕÖÉÔØ, ËÁËÏÊ ÁÓÓÅÍÂÌÅÒ ÉÓÐÏÌØÚÕÅÔÓÑ ÷ÁÛÅÊ ËÏÍÁÎÄÏÊ "gcc" (× ÔÏÍ ÓÌÕÞÁÅ, ÅÓÌÉ Á×ÔÏÏÐÒÅÄÅÌÅÎÉÅ ÎÅ ÓÒÁÂÏÔÁÅÔ, ÉÓÐÏÌØÚÕÊÔÅ ÏÐÃÉÀ -, ÞÔÏÂÙ ÓÏÏÂÝÉÔØ +, ÞÔÏÂÙ ÓÏÏÂÝÉÔØ ÓËÒÉÐÔÕ configure, ÇÄÅ ÍÏÖÎÏ ÏÂÎÁÒÕÖÉÔØ GNU "as" ÎÁ ÷ÁÛÅÊ ÓÉÓÔÅÍÅ). diff -r 8ba8ec1293e7 -r 252fb0cf331a DOCS/zh/documentation.html --- a/DOCS/zh/documentation.html Sun Oct 26 13:43:30 2003 +0000 +++ b/DOCS/zh/documentation.html Sun Oct 26 14:58:17 2003 +0000 @@ -1304,7 +1304,7 @@

ÔÚSolaris x86ÉÏ£¬ÄãÐèÒªGNU»ã±à³ÌÐòºÍGNU C/C++±àÒëÆ÷£¬ÉèÖÃʹÓÃGNUµÄ»ã±à³ÌÐò£¡ÔÚx86ƽ̨ÉϵÄmplayer´úÂë´óÁ¿Ê¹ÓÃMMX£¬SSEºÍ3DNOW£¡ Ö¸Á£¬Ê¹ÓÃSunµÄ»ã±à³ÌÐò/usr/ccs/bin/as²»ÄܱàÒëͨ¹ý¡£

-

configure½Å±¾½«ÊÔͼ²éÕÒÄãµÄ"gcc"ÃüÁîʹÓõĻã±à³ÌÐò(Èç¹û×Ô¶¯¼ì²âʧ°Ü£¬Ê¹ÓÃ"--as=/whereever/you/have/installed/gnu-as" +

configure½Å±¾½«ÊÔͼ²éÕÒÄãµÄ"gcc"ÃüÁîʹÓõĻã±à³ÌÐò(Èç¹û×Ô¶¯¼ì²âʧ°Ü£¬Ê¹ÓÃ"--as=/wherever/you/have/installed/gnu-as" Ñ¡Ïî¸æËßconfigure½Å±¾ÄãµÄϵͳÖÐGNUµÄ"as"ÔÚÄÄÀï)¡£

ÔÚSolaris x86ϵͳÉÏʹÓÃûÓÐGNU»ã±à³ÌÐòµÄGCCʱconfigureµÄ³ö´íÐÅϢΪ£º