diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-04-26 17:54:52 +0300 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-04-26 17:55:05 +0300 |
commit | e913d6c5dabcf342d8c1a7070382d712fc354948 (patch) | |
tree | 965b5b698c7075e53123593eb4b5bfdb45d78c56 /DOCS | |
parent | be935e27666d8fdbf387adb1fcc30d243f6359dc (diff) | |
parent | 00959d5cf76d4ad94de9d0022b7b40a58acf2b95 (diff) | |
download | mpv-e913d6c5dabcf342d8c1a7070382d712fc354948.tar.bz2 mpv-e913d6c5dabcf342d8c1a7070382d712fc354948.tar.xz |
Merge svn changes up to r31004
Diffstat (limited to 'DOCS')
-rw-r--r-- | DOCS/tech/patches.txt | 4 | ||||
-rw-r--r-- | DOCS/xml/cs/mencoder.xml | 6 | ||||
-rw-r--r-- | DOCS/xml/de/mencoder.xml | 2 | ||||
-rw-r--r-- | DOCS/xml/en/mencoder.xml | 8 | ||||
-rw-r--r-- | DOCS/xml/fr/mencoder.xml | 6 | ||||
-rw-r--r-- | DOCS/xml/hu/mencoder.xml | 6 | ||||
-rw-r--r-- | DOCS/xml/it/encoding-guide.xml | 72 | ||||
-rw-r--r-- | DOCS/xml/it/mencoder.xml | 6 | ||||
-rw-r--r-- | DOCS/xml/pl/mencoder.xml | 6 | ||||
-rw-r--r-- | DOCS/xml/ru/mencoder.xml | 6 | ||||
-rw-r--r-- | DOCS/xml/zh_CN/mencoder.xml | 6 |
11 files changed, 80 insertions, 48 deletions
diff --git a/DOCS/tech/patches.txt b/DOCS/tech/patches.txt index 692666d1a8..dfff16bf85 100644 --- a/DOCS/tech/patches.txt +++ b/DOCS/tech/patches.txt @@ -56,8 +56,8 @@ that your patch will be included. and committed separately. Logical units should stay together, though, i.e. do not send a patch for every file or directory you change. - 9. Send your patch to the mplayer-dev-eng mailing list as a base64-encoded - attachment with the subject line: + 9. Send your patch to the mplayer-dev-eng mailing list as attachment with + the subject line: '[PATCH] very short description of the patch'. In the mail, describe in a few sentences what you change and why. The subject line is very important if you do not want your patch to get diff --git a/DOCS/xml/cs/mencoder.xml b/DOCS/xml/cs/mencoder.xml index 19c289d137..3b3ff87f3c 100644 --- a/DOCS/xml/cs/mencoder.xml +++ b/DOCS/xml/cs/mencoder.xml @@ -402,9 +402,9 @@ Budete-li respektovat následující omezení, neměli byste narazit na potíže <title>Enkódování do PSP</title> <para> <screen> -mencoder -ofps 30000/1001 -af lavcresample=24000 -vf harddup -of lavf \ - -oac lavc -ovc lavc -lavcopts aglobal=1:vglobal=1:vcodec=mpeg4:acodec=aac \ - -lavfopts format=psp \ +mencoder -ofps 30000/1001 -af lavcresample=24000 -vf harddup -oac lavc \ + -ovc lavc -lavcopts aglobal=1:vglobal=1:vcodec=mpeg4:acodec=libfaac \ + -of lavf -lavfopts format=psp \ <replaceable>vstupní.video</replaceable> -o <replaceable>výstupní.psp</replaceable> </screen> Poznamenejme, že můžete nastavit jméno videa pomocí diff --git a/DOCS/xml/de/mencoder.xml b/DOCS/xml/de/mencoder.xml index 299aa9f907..90afe5b91b 100644 --- a/DOCS/xml/de/mencoder.xml +++ b/DOCS/xml/de/mencoder.xml @@ -344,7 +344,7 @@ <para> <screen> mencoder -ofps 30000/1001 -af lavcresample=24000 -vf harddup -of lavf \ - -oac lavc -ovc lavc -lavcopts aglobal=1:vglobal=1:vcodec=mpeg4:acodec=aac \ + -oac lavc -ovc lavc -lavcopts aglobal=1:vglobal=1:vcodec=mpeg4:acodec=libfaac \ -lavfopts format=psp \ <replaceable>input.video</replaceable> -o <replaceable>output.psp</replaceable> </screen> diff --git a/DOCS/xml/en/mencoder.xml b/DOCS/xml/en/mencoder.xml index 8914d229d1..e866016740 100644 --- a/DOCS/xml/en/mencoder.xml +++ b/DOCS/xml/en/mencoder.xml @@ -401,9 +401,9 @@ You should be safe if you respect the following constraints: <title>encode for PSP</title> <para> <screen> -mencoder -ofps 30000/1001 -af lavcresample=24000 -vf harddup -of lavf \ - -oac lavc -ovc lavc -lavcopts aglobal=1:vglobal=1:vcodec=mpeg4:acodec=aac \ - -lavfopts format=psp \ +mencoder -ofps 30000/1001 -af lavcresample=24000 -vf harddup -oac lavc \ + -ovc lavc -lavcopts aglobal=1:vglobal=1:vcodec=mpeg4:acodec=libfaac \ + -of lavf -lavfopts format=psp \ <replaceable>input.video</replaceable> -o <replaceable>output.psp</replaceable> </screen> Note that you can set the title of the video with @@ -615,7 +615,7 @@ mencoder mf://<replaceable>@list.txt</replaceable> -mf w=800:h=600:fps=25:type=j </informalexample> You can mix different types of images, regardless of the method you use -— individual filenames, wildcard or file with list — provided of +t — individual filenames, wildcard or file with list — provided of course they have the same dimensions. So you can e.g. take title frame from PNG file, and then put a slideshow of your JPEG photos. diff --git a/DOCS/xml/fr/mencoder.xml b/DOCS/xml/fr/mencoder.xml index f147cd1de7..a10ad2101f 100644 --- a/DOCS/xml/fr/mencoder.xml +++ b/DOCS/xml/fr/mencoder.xml @@ -417,9 +417,9 @@ mencoder dvd://2 -ovc lavc -lavcopts vcodec=mpeg4:mbd=2:trell:vpass=2 \ <title>Encodage pour PSP</title> <para> <screen> -mencoder -ofps 30000/1001 -af lavcresample=24000 -vf harddup -of lavf \ - -oac lavc -ovc lavc -lavcopts aglobal=1:vglobal=1:vcodec=mpeg4:acodec=aac \ - -lavfopts format=psp \ +mencoder -ofps 30000/1001 -af lavcresample=24000 -vf harddup -oac lavc \ + -ovc lavc -lavcopts aglobal=1:vglobal=1:vcodec=mpeg4:acodec=libfaac \ + -of lavf -lavfopts format=psp \ <replaceable>entree.video</replaceable> -o <replaceable>sortie.psp</replaceable> </screen> Vous pouvez définir le titre de la vidéo avec diff --git a/DOCS/xml/hu/mencoder.xml b/DOCS/xml/hu/mencoder.xml index 8ab02d7a54..aa44999324 100644 --- a/DOCS/xml/hu/mencoder.xml +++ b/DOCS/xml/hu/mencoder.xml @@ -400,9 +400,9 @@ Nyugodt lehetsz, ha a következő korlátokat figyelembe veszed: <title>kódolás PSP-be</title> <para> <screen> -mencoder -ofps 30000/1001 -af resample=24000 -vf harddup -of lavf \ - -oac lavc -ovc lavc -lavcopts aglobal=1:vglobal=1:vcodec=mpeg4:acodec=aac \ - -lavfopts format=psp \ +mencoder -ofps 30000/1001 -af lavcresample=24000 -vf harddup -oac lavc \ + -ovc lavc -lavcopts aglobal=1:vglobal=1:vcodec=mpeg4:acodec=libfaac \ + -of lavf -lavfopts format=psp \ <replaceable>bemenet.video</replaceable> -o <replaceable>kimenet.psp</replaceable> </screen> Figyelj rá, hogy beállíthatod a videó címét a diff --git a/DOCS/xml/it/encoding-guide.xml b/DOCS/xml/it/encoding-guide.xml index e0f1f4da07..dd326c2fa4 100644 --- a/DOCS/xml/it/encoding-guide.xml +++ b/DOCS/xml/it/encoding-guide.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- 44% synced with r22753 (row 2361) --> +<!-- 44% synced with r22753 (row 2377) --> <chapter id="encoding-guide"> <title>La codifica con <application>MEncoder</application></title> @@ -2360,18 +2360,18 @@ tipi. </listitem> <listitem><formalpara> - <title>About encoding parameters and quality:</title> + <title>Riguardo i parameti di codifica e la qualità:</title> <para> - Just because I recommend <option>mbd=2</option> here does not mean it - should not be used elsewhere. Along with <option>trell</option>, - <option>mbd=2</option> is one of the two - <systemitem class="library">libavcodec</systemitem> options that - increases quality the most, and you should always use at least those - two unless the drop in encoding speed is prohibitive (e.g. realtime - encoding). There are many other options to - <systemitem class="library">libavcodec</systemitem> that increase - encoding quality (and decrease encoding speed) but that is beyond - the scope of this document. + Il fatto che qui venga cosigliata <option>mbd=2</option> non significa che + non si debba usare altrimenti. Insieme con <option>trell</option>, + <option>mbd=2</option> è una delle due opzioni di + <systemitem class="library">libavcodec</systemitem> che ottimizzano al + meglio la qualità e sarebbero sempre da utilizzare entrambe a meno che + l'aumento della velocità di codifica sua proibitivo (ad es. per la codifica + in tempo reale (realtime)). Ci sono molte altre opzioni di + <systemitem class="library">libavcodec</systemitem> che aumentano la + qualità (e rallentano la codifica), ma questo non è l'obiettivo di + questa documentaziione. </para> </formalpara></listitem> @@ -2570,16 +2570,48 @@ mencoder dvd://2 -o <replaceable>title2.avi</replaceable> -ovc lavc -lavcopts vc </thead> <tbody> <row> + <entry>ac3</entry> + <entry>Dolby Digital (AC-3)</entry> +</row> +<row> + <entry>adpcm_*</entry> + <entry>Adaptive PCM formats - see supplementary table</entry> +</row> +<row> + <entry>flac</entry> + <entry>Free Lossless Audio Codec (FLAC)</entry> +</row> +<row> + <entry>g726</entry> + <entry>G.726 ADPCM</entry> +</row> +<row> + <entry>libfaac</entry> + <entry>Advanced Audio Coding (AAC) - using FAAC</entry> +</row> +<row> + <entry>libgsm</entry> + <entry>ETSI GSM 06.10 full rate</entry> +</row> +<row> + <entry>libgsm_ms</entry> + <entry>Microsoft GSM</entry> +</row> +<row> + <entry>libmp3lame</entry> + <entry>MPEG-1 audio layer 3 (MP3) - using LAME</entry> +</row> +<row> <entry>mp2</entry> - <entry>MPEG Layer 2</entry> + <entry>MPEG-1 audio layer 2 (MP2)</entry> </row> <row> - <entry>ac3</entry> - <entry>AC-3, AKA Dolby Digital</entry> + <entry>pcm_*</entry> + <entry>PCM formats - see supplementary table</entry> </row> <row> - <entry>adpcm_ima_wav</entry> - <entry>IMA adaptive PCM (4 bits per sample, 4:1 compression)</entry> + <entry>roq_dpcm</entry> + <entry>Id Software RoQ DPCM</entry> </row> <row> <entry>sonic</entry> @@ -2591,15 +2623,15 @@ mencoder dvd://2 -o <replaceable>title2.avi</replaceable> -ovc lavc -lavcopts vc </row> <row> <entry>vorbis</entry> - <entry>Xiph Ogg Vorbis codec</entry> + <entry>Vorbis</entry> </row> <row> <entry>wmav1</entry> - <entry>Windows Media Audio v1 codec</entry> + <entry>Windows Media Audio v1</entry> </row> <row> <entry>wmav2</entry> - <entry>Windows Media Audio v2 codec</entry> + <entry>Windows Media Audio v2</entry> </row> </tbody> </tgroup> diff --git a/DOCS/xml/it/mencoder.xml b/DOCS/xml/it/mencoder.xml index 35745d8413..dedd53c31f 100644 --- a/DOCS/xml/it/mencoder.xml +++ b/DOCS/xml/it/mencoder.xml @@ -401,9 +401,9 @@ Dovresti accertarti di rispettare i seguenti vincoli: <title>codificare per PSP</title> <para> <screen> -mencoder -ofps 30000/1001 -af lavcresample=24000 -vf harddup -of lavf \ - -oac lavc -ovc lavc -lavcopts aglobal=1:vglobal=1:vcodec=mpeg4:acodec=aac \ - -lavfopts format=psp \ +mencoder -ofps 30000/1001 -af lavcresample=24000 -vf harddup -oac lavc \ + -ovc lavc -lavcopts aglobal=1:vglobal=1:vcodec=mpeg4:acodec=libfaac \ + -of lavf -lavfopts format=psp \ <replaceable>input.video</replaceable> -o <replaceable>output.psp</replaceable> </screen> Nota che puoi impostare il titolo del video con diff --git a/DOCS/xml/pl/mencoder.xml b/DOCS/xml/pl/mencoder.xml index 3ad695a522..f14583bf38 100644 --- a/DOCS/xml/pl/mencoder.xml +++ b/DOCS/xml/pl/mencoder.xml @@ -387,9 +387,9 @@ Powinieneś byś bezpieczny, jeśli respektujesz poniższe ograniczenia: <title>kodowanie dla PSP</title> <para> <screen> -mencoder -ofps 30000/1001 -af lavcresample=24000 -vf harddup -of lavf \ - -oac lavc -ovc lavc -lavcopts aglobal=1:vglobal=1:vcodec=mpeg4:acodec=aac \ - -lavfopts format=psp:i_certify_that_my_video_stream_does_not_use_b_frames \ +mencoder -ofps 30000/1001 -af lavcresample=24000 -vf harddup -oac lavc \ + -ovc lavc -lavcopts aglobal=1:vglobal=1:vcodec=mpeg4:acodec=libfaac \ + -of lavf -lavfopts format=psp \ <replaceable>wejściowe.video</replaceable> -o <replaceable>wyjście.psp</replaceable> </screen> Możesz też ustawić tytuł filmu dzięki diff --git a/DOCS/xml/ru/mencoder.xml b/DOCS/xml/ru/mencoder.xml index d5376e4e33..e45ee509f1 100644 --- a/DOCS/xml/ru/mencoder.xml +++ b/DOCS/xml/ru/mencoder.xml @@ -394,9 +394,9 @@ Sony PSP, но, в зависимости от ревизии программн <title>Кодирование для PSP</title> <para> <screen> -mencoder -ofps 30000/1001 -af lavcresample=24000 -vf harddup -of lavf \ - -oac lavc -ovc lavc -lavcopts aglobal=1:vglobal=1:vcodec=mpeg4:acodec=aac \ - -lavfopts format=psp \ +mencoder -ofps 30000/1001 -af lavcresample=24000 -vf harddup -oac lavc \ + -ovc lavc -lavcopts aglobal=1:vglobal=1:vcodec=mpeg4:acodec=libfaac \ + -of lavf -lavfopts format=psp \ <replaceable>input.video</replaceable> -o <replaceable>output.psp</replaceable> </screen> Заметьте, что можно задать заголовок видео опцией diff --git a/DOCS/xml/zh_CN/mencoder.xml b/DOCS/xml/zh_CN/mencoder.xml index 81ab1170dc..878e2f4bec 100644 --- a/DOCS/xml/zh_CN/mencoder.xml +++ b/DOCS/xml/zh_CN/mencoder.xml @@ -364,9 +364,9 @@ PSP软件修改,对不同软件限制也许会有不同。 <title>编码到PSP</title> <para> <screen> -mencoder -ofps 30000/1001 -af lavcresample=24000 -vf harddup -of lavf \ - -oac lavc -ovc lavc -lavcopts aglobal=1:vglobal=1:vcodec=mpeg4:acodec=aac \ - -lavfopts format=psp:i_certify_that_my_video_stream_does_not_use_b_frames \ +mencoder -ofps 30000/1001 -af lavcresample=24000 -vf harddup -oac lavc \ + -ovc lavc -lavcopts aglobal=1:vglobal=1:vcodec=mpeg4:acodec=libfaac \ + -of lavf -lavfopts format=psp \ <replaceable>input.video</replaceable> -o <replaceable>output.psp</replaceable> </screen> 注意你可以通过 |